Merge branch 'fix-sles-builds-trigger' into 'master'

Pass DEV_BUILDER_IMAGE_REGISTRY variable to downstream pipeline

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7517

Merged-by: Robert Marshall <[email protected]>
Approved-by: Robert Marshall <[email protected]>
Co-authored-by: Balasankar 'Balu' C <[email protected]>

Author: Robert Marshall

gitlab-ci-config/gitlab-com.yml

@@ -93,6 +93,7 @@
   BUILDER_IMAGE_REVISION: ${BUILDER_IMAGE_REVISION}
   BUILDER_IMAGE_REGISTRY: ${BUILDER_IMAGE_REGISTRY}
   PUBLIC_BUILDER_IMAGE_REGISTRY: ${PUBLIC_BUILDER_IMAGE_REGISTRY}
+  DEV_BUILDER_IMAGE_REGISTRY: ${DEV_BUILDER_IMAGE_REGISTRY}
   COMPILE_ASSETS: ${COMPILE_ASSETS}
   GITLAB_VERSION: ${GITLAB_VERSION}
   GITLAB_SHELL_VERSION: ${GITLAB_SHELL_VERSION}

lib/gitlab/build/facts.rb

@@ -76,6 +76,7 @@ def common_vars
           BUILDER_IMAGE_REVISION=#{Gitlab::Util.get_env('BUILDER_IMAGE_REVISION')}
           BUILDER_IMAGE_REGISTRY=#{Gitlab::Util.get_env('BUILDER_IMAGE_REGISTRY')}
           PUBLIC_BUILDER_IMAGE_REGISTRY=#{Gitlab::Util.get_env('PUBLIC_BUILDER_IMAGE_REGISTRY')}
+          DEV_BUILDER_IMAGE_REGISTRY=#{Gitlab::Util.get_env('DEV_BUILDER_IMAGE_REGISTRY')}
           COMPILE_ASSETS=#{Gitlab::Util.get_env('COMPILE_ASSETS') || 'false'}
           EDITION=#{Build::Info::Package.edition.upcase}
           ee=#{Build::Check.is_ee? || 'false'}

spec/lib/gitlab/build/facts_spec.rb

@@ -197,6 +197,7 @@
       stub_env_var('BUILDER_IMAGE_REVISION', '1.2.3')
       stub_env_var('BUILDER_IMAGE_REGISTRY', 'registry.example.com')
       stub_env_var('PUBLIC_BUILDER_IMAGE_REGISTRY', 'registry.example.com')
+      stub_env_var('DEV_BUILDER_IMAGE_REGISTRY', 'dev.gitlab.org:5005')
     end
 
     it 'returns correct variables' do
@@ -210,6 +211,7 @@
         BUILDER_IMAGE_REVISION=1.2.3
         BUILDER_IMAGE_REGISTRY=registry.example.com
         PUBLIC_BUILDER_IMAGE_REGISTRY=registry.example.com
+        DEV_BUILDER_IMAGE_REGISTRY=dev.gitlab.org:5005
         COMPILE_ASSETS=false
         EDITION=CE
         ee=false