Use package version slug as triggered docker image tag

Signed-off-by: Balasankar "Balu" C <balasankarc@autistici.org>

lib/gitlab/build/ha_validate/trigger.rb

@@ -27,7 +27,7 @@ module Build
       end
       def self.get_params(image: nil)
-        qa_image = image || "registry.gitlab.com/#{Build::Info::OMNIBUS_PROJECT_MIRROR_PATH}/gitlab-ee-qa:omnibus-#{Gitlab::Util.get_env('CI_COMMIT_SHA')}"
+        qa_image = image || "registry.gitlab.com/#{Build::Info::OMNIBUS_PROJECT_MIRROR_PATH}/gitlab-ee-qa:#{Build::Info.docker_tag}"
         {
           'ref' => 'master',
           'token' => Gitlab::Util.get_env('HA_VALIDATE_TOKEN'),

lib/gitlab/build/omnibus_trigger.rb

@@ -19,7 +19,7 @@ module Build
         "variables[BUILDER_IMAGE_REGISTRY]" => Gitlab::Util.get_env('BUILDER_IMAGE_REGISTRY'),
         "variables[PUBLIC_BUILDER_IMAGE_REGISTRY]" => Gitlab::Util.get_env('PUBLIC_BUILDER_IMAGE_REGISTRY'),
         "variables[COMPILE_ASSETS]" => Gitlab::Util.get_env('COMPILE_ASSETS'),
-        "variables[IMAGE_TAG]" => "omnibus-#{Gitlab::Util.get_env('CI_COMMIT_SHA')}",
+        "variables[IMAGE_TAG]" => Build::Info.docker_tag,
         "variables[ee]" => Gitlab::Util.get_env("ee") || "false",
         "variables[TRIGGERED_USER]" => Gitlab::Util.get_env("TRIGGERED_USER") || Gitlab::Util.get_env("GITLAB_USER_NAME"),
         "variables[TRIGGER_SOURCE]" => Gitlab::Util.get_env('CI_JOB_URL'),

spec/gitlab/build/ha_validate/trigger_spec.rb

@@ -6,6 +6,7 @@ RSpec.describe Build::HA::ValidateTrigger do
     allow(ENV).to receive(:[]).and_call_original
     allow(ENV).to receive(:[]).with('CI_COMMIT_SHA').and_return('11111111111111111')
     allow(ENV).to receive(:[]).with('HA_VALIDATE_TOKEN').and_return('faketoken')
+    allow(Build::Info).to receive(:docker_tag).and_return('13.2.0-ce-0')
     allow(Build::Info).to receive(:fetch_pipeline_jobs).and_return(
       [
         {
@@ -34,7 +35,7 @@ RSpec.describe Build::HA::ValidateTrigger do
         {
           'ref' => 'master',
           'token' => 'faketoken',
-          'variables[QA_IMAGE]' => 'registry.gitlab.com/gitlab-org/build/omnibus-gitlab-mirror/gitlab-ee-qa:omnibus-11111111111111111',
+          'variables[QA_IMAGE]' => 'registry.gitlab.com/gitlab-org/build/omnibus-gitlab-mirror/gitlab-ee-qa:13.2.0-ce-0',
           'variables[OMNIBUS_JOB_ID]' => 3
         }
       )