Skip to content

Commit 668e131

Browse files
Robert Marshallbalasankarc
andcommitted
Merge branch 'switch-from-ruby-docker-image' into 'master'
Switch ruby_docker image with distribution_ci_tools one See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7091 Merged-by: Robert Marshall <[email protected]> Approved-by: Andrew Patterson <[email protected]> Approved-by: Robert Marshall <[email protected]> Co-authored-by: Balasankar "Balu" C <[email protected]>
2 parents c0dbbbf + 1edc565 commit 668e131

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ variables:
8585

8686
### For services that need a docker daemon
8787
.docker_job: &docker_job
88-
image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
88+
image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
8989
variables:
9090
DOCKER_DRIVER: overlay2
9191
DOCKER_HOST: tcp://docker:2375
@@ -182,7 +182,7 @@ fetch-assets:
182182
generate-facts:
183183
extends: .gems-cache
184184
stage: prepare
185-
image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
185+
image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
186186
script:
187187
- mkdir -p build_facts
188188
- bundle exec omnibus manifest gitlab -l nothing > build_facts/version-manifest.json

gitlab-ci-config/dev-gitlab-org.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@
253253
when: manual
254254

255255
.aws_marketplace_release: &aws_marketplace_release
256-
image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
256+
image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
257257
stage: aws-marketplace-release
258258
script:
259259
- export AWS_ACCESS_KEY_ID=$AWS_AMI_ACCESS_KEY_ID
@@ -1177,7 +1177,7 @@ check-packages:
11771177

11781178
create-gitlab-release:
11791179
stage: package-and-image-release
1180-
image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
1180+
image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
11811181
needs:
11821182
- job: AWS
11831183
artifacts: true

gitlab-ci-config/gitlab-com.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@
243243
update-gems-cache:
244244
extends: .gems-cache
245245
stage: update-cache
246-
image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
246+
image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
247247
before_script: !reference [.install-gems]
248248
script:
249249
- echo "Cache is up to date!"
@@ -733,7 +733,7 @@ dependency_scanning:
733733
- dependency_report.txt
734734

735735
dependency_update:
736-
image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
736+
image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
737737
stage: prepare
738738
before_script: []
739739
script:

0 commit comments

Comments
 (0)