diff --git a/GITLAB_ELASTICSEARCH_INDEXER_VERSION b/GITLAB_ELASTICSEARCH_INDEXER_VERSION new file mode 100644 index 0000000000000000000000000000000000000000..1cc6f64b6f627756cb049555343879c5702d69ab_R0lUTEFCX0VMQVNUSUNTRUFSQ0hfSU5ERVhFUl9WRVJTSU9O --- /dev/null +++ b/GITLAB_ELASTICSEARCH_INDEXER_VERSION @@ -0,0 +1,1 @@ +1.3.0 diff --git a/changelogs/unreleased/add-gitlab-elasticsearch-indexer-version.yml b/changelogs/unreleased/add-gitlab-elasticsearch-indexer-version.yml new file mode 100644 index 0000000000000000000000000000000000000000..1cc6f64b6f627756cb049555343879c5702d69ab_Y2hhbmdlbG9ncy91bnJlbGVhc2VkL2FkZC1naXRsYWItZWxhc3RpY3NlYXJjaC1pbmRleGVyLXZlcnNpb24ueW1s --- /dev/null +++ b/changelogs/unreleased/add-gitlab-elasticsearch-indexer-version.yml @@ -0,0 +1,5 @@ +--- +title: Consult the gitlab-elasticsearch-indexer version from GitLab +merge_request: 3276 +author: +type: other diff --git a/config/software/gitlab-elasticsearch-indexer.rb b/config/software/gitlab-elasticsearch-indexer.rb index fbb93937fc750f6808b8edaf25ddfb2353d3a25c_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1lbGFzdGljc2VhcmNoLWluZGV4ZXIucmI=..1cc6f64b6f627756cb049555343879c5702d69ab_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1lbGFzdGljc2VhcmNoLWluZGV4ZXIucmI= 100644 --- a/config/software/gitlab-elasticsearch-indexer.rb +++ b/config/software/gitlab-elasticsearch-indexer.rb @@ -18,7 +18,7 @@ version = Gitlab::Version.new('gitlab-elasticsearch-indexer') name 'gitlab-elasticsearch-indexer' -default_version 'v1.3.0' +default_version version.print license 'MIT' license_file 'LICENSE' diff --git a/lib/gitlab/version.rb b/lib/gitlab/version.rb index fbb93937fc750f6808b8edaf25ddfb2353d3a25c_bGliL2dpdGxhYi92ZXJzaW9uLnJi..1cc6f64b6f627756cb049555343879c5702d69ab_bGliL2dpdGxhYi92ZXJzaW9uLnJi 100644 --- a/lib/gitlab/version.rb +++ b/lib/gitlab/version.rb @@ -28,6 +28,8 @@ Gitlab::Util.get_env("GITLAB_PAGES_VERSION") when "gitaly" Gitlab::Util.get_env("GITALY_SERVER_VERSION") + when "gitlab-elasticsearch-indexer" + Gitlab::Util.get_env("GITLAB_ELASTICSEARCH_INDEXER_VERSION") end end @@ -51,7 +53,8 @@ "gitlab-shell" => "GITLAB_SHELL_VERSION", "gitlab-workhorse" => "GITLAB_WORKHORSE_VERSION", "gitlab-pages" => "GITLAB_PAGES_VERSION", - "gitaly" => "GITALY_SERVER_VERSION" + "gitaly" => "GITALY_SERVER_VERSION", + "gitlab-elasticsearch-indexer" => "GITLAB_ELASTICSEARCH_INDEXER_VERSION" } end diff --git a/support/set-revisions b/support/set-revisions index fbb93937fc750f6808b8edaf25ddfb2353d3a25c_c3VwcG9ydC9zZXQtcmV2aXNpb25z..1cc6f64b6f627756cb049555343879c5702d69ab_c3VwcG9ydC9zZXQtcmV2aXNpb25z 100755 --- a/support/set-revisions +++ b/support/set-revisions @@ -5,6 +5,7 @@ gitlab_shell_ref=$2 gitlab_workhorse_ref=$3 gitaly_ref=$4 + indexer_ref=$5 if [[ "$gitlab_rails_ref" == *"-ee"* ]] ; then gitlab_rails_repo=git@dev.gitlab.org:gitlab/gitlab-ee.git @@ -14,6 +15,7 @@ gitlab_shell_repo=git@dev.gitlab.org:gitlab/gitlab-shell.git gitlab_workhorse_repo=git@dev.gitlab.org:gitlab/gitlab-workhorse.git gitaly_repo=git@dev.gitlab.org:gitlab/gitaly.git + indexer_repo=git@dev.gitlab.org:gitlab/gitlab-elasticsearch-indexer.git gitlab_rails_ref_id=$(check_remote_ref gitlab_rails) assert_non_empty gitlab_rails_ref_id @@ -24,7 +26,10 @@ gitaly_ref_id=$(check_remote_ref gitaly) assert_non_empty gitaly_ref_id + indexer_ref_id=$(check_remote_ref gitlab-elasticsearch-indexer) + assert_non_empty indexer_ref_id + set_source_and_version $gitlab_rails_ref VERSION set_source_and_version $gitlab_shell_ref GITLAB_SHELL_VERSION set_source_and_version $gitlab_workhorse_ref GITLAB_WORKHORSE_VERSION set_source_and_version $gitaly_ref GITALY_SERVER_VERSION @@ -27,7 +32,8 @@ set_source_and_version $gitlab_rails_ref VERSION set_source_and_version $gitlab_shell_ref GITLAB_SHELL_VERSION set_source_and_version $gitlab_workhorse_ref GITLAB_WORKHORSE_VERSION set_source_and_version $gitaly_ref GITALY_SERVER_VERSION + set_source_and_version $indexer_ref GITLAB_ELASTICSEARCH_INDEXER_VERSION } # set_source_and_version foo_ref file @@ -81,8 +87,8 @@ fi -if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ] || [ -z "$4" ] || [ -n "$5" ]; then - warn "Usage: $0 GITLAB_RAILS_REF GITLAB_SHELL_REF GITLAB_WORKHORSE_REF GITALY_REF" +if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ] || [ -z "$4" ] || [ -z "$5" ] || [ -n "$6" ]; then + warn "Usage: $0 GITLAB_RAILS_REF GITLAB_SHELL_REF GITLAB_WORKHORSE_REF GITALY_REF GITLAB_ELASTICSEARCH_INDEXER_REF" exit 1 fi