Skip to content
Snippets Groups Projects
Commit 441cad3831bc authored by Robert Marshall's avatar Robert Marshall
Browse files

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: default avatarRobert Marshall <rmarshall@gitlab.com>
Approved-by: default avatarRobert Marshall <rmarshall@gitlab.com>
Co-authored-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
No related branches found
No related tags found
3 merge requests!128heptapod#1534: making 1.5 the oldstable,!125heptapod#1494: make 1.5 the new stable,!124Upstream 16.11 quasi branching point
......@@ -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}
......
......@@ -76,6 +76,7 @@
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'}
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment