diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d6dd79d96ebc31a40affc201584467af40d2e63_LmdpdGxhYi1jaS55bWw=..e5b738505fc4dc5cf4d1bcacb64754f74a0cdbc2_LmdpdGxhYi1jaS55bWw= 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,6 +39,8 @@ # settings of omnibus-gitlab mirror in dev.gitlab.org so that builds there # will use images from that registry and not depend on GitLab.com BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder" + # To be used for images that exist only on dev.gitlab.org + DEV_BUILDER_IMAGE_REGISTRY: 'dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder' PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder" BUILDER_IMAGE_REVISION: "4.9.1" # The registry to pull the assets image from diff --git a/gitlab-ci-config/dev-gitlab-org.yml b/gitlab-ci-config/dev-gitlab-org.yml index 0d6dd79d96ebc31a40affc201584467af40d2e63_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw=..e5b738505fc4dc5cf4d1bcacb64754f74a0cdbc2_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw= 100644 --- a/gitlab-ci-config/dev-gitlab-org.yml +++ b/gitlab-ci-config/dev-gitlab-org.yml @@ -351,5 +351,5 @@ tags: - docker-arm-builder SLES-12.5-branch: - image: "${BUILDER_IMAGE_REGISTRY}/sles_12sp5:${BUILDER_IMAGE_REVISION}" + image: "${DEV_BUILDER_IMAGE_REGISTRY}/sles_12sp5:${BUILDER_IMAGE_REVISION}" extends: .branch_template @@ -355,5 +355,7 @@ extends: .branch_template + variables: + DOCKER_AUTH_CONFIG: $DEV_BUILDER_DOCKER_AUTH_CONFIG rules: - !reference [.default_rules, rules] - if: '$PIPELINE_TYPE =~ /EE_(NIGHTLY|BRANCH)_BUILD_PIPELINE$/' SLES-15.2-branch: @@ -356,6 +358,6 @@ rules: - !reference [.default_rules, rules] - if: '$PIPELINE_TYPE =~ /EE_(NIGHTLY|BRANCH)_BUILD_PIPELINE$/' SLES-15.2-branch: - image: "${BUILDER_IMAGE_REGISTRY}/sles_15sp2:${BUILDER_IMAGE_REVISION}" + image: "${DEV_BUILDER_IMAGE_REGISTRY}/sles_15sp2:${BUILDER_IMAGE_REVISION}" extends: .branch_template @@ -361,4 +363,6 @@ extends: .branch_template + variables: + DOCKER_AUTH_CONFIG: $DEV_BUILDER_DOCKER_AUTH_CONFIG rules: - !reference [.default_rules, rules] - if: '$PIPELINE_TYPE =~ /EE_(NIGHTLY|BRANCH)_BUILD_PIPELINE$/' diff --git a/gitlab-ci-config/gitlab-com.yml b/gitlab-ci-config/gitlab-com.yml index 0d6dd79d96ebc31a40affc201584467af40d2e63_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA==..e5b738505fc4dc5cf4d1bcacb64754f74a0cdbc2_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA== 100644 --- a/gitlab-ci-config/gitlab-com.yml +++ b/gitlab-ci-config/gitlab-com.yml @@ -735,7 +735,7 @@ - if: '$PIPELINE_TYPE == "LICENSE_PAGE_UPDATE_PIPELINE"' .build-package-on-all-os-vars: - SKIP_JOB_REGEX: '/SLES|Ubuntu-20.04|Docker|QA/' + SKIP_JOB_REGEX: '/Ubuntu-20.04|Docker|QA/' PIPELINE_TYPE: "${EDITION}_BRANCH_BUILD_PIPELINE" ALTERNATIVE_SOURCES: 'true' GITLAB_VERSION: ${GITLAB_VERSION}