Skip to content

Commit 1edc565

Browse files
committed
Switch ruby_docker image with distribution_ci_tools one
The image was renamed in https://gitlab.com/gitlab-org/gitlab-omnibus-builder/-/merge_requests/303 Signed-off-by: Balasankar "Balu" C <[email protected]>
1 parent f1984e1 commit 1edc565

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
@@ -174,7 +174,7 @@ fetch-assets:
174174
generate-facts:
175175
extends: .gems-cache
176176
stage: prepare
177-
image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
177+
image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
178178
script:
179179
- mkdir -p build_facts
180180
- 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
@@ -257,7 +257,7 @@
257257
when: manual
258258

259259
.aws_marketplace_release: &aws_marketplace_release
260-
image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
260+
image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
261261
stage: aws-marketplace-release
262262
script:
263263
- export AWS_ACCESS_KEY_ID=$AWS_AMI_ACCESS_KEY_ID
@@ -1147,7 +1147,7 @@ check-packages:
11471147

11481148
create-gitlab-release:
11491149
stage: package-and-image-release
1150-
image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
1150+
image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
11511151
needs:
11521152
- job: AWS
11531153
artifacts: true

gitlab-ci-config/gitlab-com.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
update-gems-cache:
230230
extends: .gems-cache
231231
stage: update-cache
232-
image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
232+
image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
233233
before_script: !reference [.install-gems]
234234
script:
235235
- echo "Cache is up to date!"
@@ -699,7 +699,7 @@ dependency_scanning:
699699
- dependency_report.txt
700700

701701
dependency_update:
702-
image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
702+
image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
703703
stage: prepare
704704
before_script: []
705705
script:

0 commit comments

Comments
 (0)