Skip to content

Commit fd65c0a

Browse files
authored
Pull CI images from registry.ddbuild.io (#10744)
Pull CI images from registry.ddbuild.io Revert prefix name and add ci- prefix Merge branch 'master' into sarahchen6/update-ci-images Merge branch 'master' into sarahchen6/update-ci-images Remove update-docker-build-image from README Merge branch 'master' into sarahchen6/update-ci-images Merge branch 'master' into sarahchen6/update-ci-images Co-authored-by: sarah.chen <sarah.chen@datadoghq.com>
1 parent e3ef803 commit fd65c0a

File tree

3 files changed

+7
-112
lines changed

3 files changed

+7
-112
lines changed

.github/workflows/README.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,6 @@ Close them if no following update within a week.
9191

9292
_Recovery:_ Manually trigger the action again.
9393

94-
### update-docker-build-image [🔗](update-docker-build-image.yaml)
95-
96-
_Trigger:_ Quarterly released, loosely [a day after the new image tag is created](https://github.com/DataDog/dd-trace-java-docker-build/blob/master/.github/workflows/docker-tag.yml).
97-
98-
_Action:_ Update the Docker build image used in GitLab CI with the latest tag.
99-
100-
_Recovery:_ Download artifacts and upload them manually to the related _download release_.
101-
102-
_Notes:_ Manually trigger the action again given the desired image tag as input.
103-
10494
### update-download-releases [🔗](update-download-releases.yaml)
10595

10696
_Trigger:_ When a release is published.

.github/workflows/update-docker-build-image.yaml

Lines changed: 0 additions & 96 deletions
This file was deleted.

.gitlab-ci.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ variables:
2929
GRADLE_VERSION: "8.14.4" # must match gradle-wrapper.properties
3030
MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
3131
GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
32-
BUILDER_IMAGE_VERSION_PREFIX: "v26.02-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
32+
BUILDER_IMAGE_REPO: "registry.ddbuild.io/images/mirror/dd-trace-java-docker-build" # images are pinned in images/mirror.lock.yaml in the DataDog/images repo
33+
BUILDER_IMAGE_VERSION_PREFIX: "ci-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "ci-" or "123_merge-")
3334
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
3435
DEFAULT_TEST_JVMS: /^(8|11|17|21|25|tip)$/ # the latest "tip" version is 26
3536
PROFILE_TESTS:
@@ -142,7 +143,7 @@ default:
142143
fi
143144
144145
.gradle_build: &gradle_build
145-
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
146+
image: ${BUILDER_IMAGE_REPO}:${BUILDER_IMAGE_VERSION_PREFIX}base
146147
stage: build
147148
variables:
148149
MAVEN_OPTS: "-Xms256M -Xmx1024M"
@@ -218,7 +219,7 @@ default:
218219
# on the central publisher portal, it invalidates the old one. This check prevents going further.
219220
# See https://datadoghq.atlassian.net/wiki/x/Oog5OgE
220221
maven-central-pre-release-check:
221-
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
222+
image: ${BUILDER_IMAGE_REPO}:${BUILDER_IMAGE_VERSION_PREFIX}base
222223
stage: .pre
223224
rules:
224225
- if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/'
@@ -399,7 +400,7 @@ config-inversion-linter:
399400

400401
test_published_artifacts:
401402
extends: .gradle_build
402-
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}7 # Needs Java7 for some tests
403+
image: ${BUILDER_IMAGE_REPO}:${BUILDER_IMAGE_VERSION_PREFIX}7 # Needs Java7 for some tests
403404
stage: tests
404405
needs: [ build ]
405406
variables:
@@ -566,7 +567,7 @@ muzzle-dep-report:
566567

567568
.test_job:
568569
extends: .gradle_build
569-
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}$testJvm
570+
image: ${BUILDER_IMAGE_REPO}:${BUILDER_IMAGE_VERSION_PREFIX}$testJvm
570571
tags: [ "docker-in-docker:amd64" ] # use docker-in-docker runner for testcontainers
571572
needs: [ build_tests ]
572573
stage: tests
@@ -794,7 +795,7 @@ test_smoke_semeru8_debugger:
794795
testJvm: "semeru8"
795796

796797
aggregate_test_counts:
797-
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
798+
image: ${BUILDER_IMAGE_REPO}:${BUILDER_IMAGE_VERSION_PREFIX}base
798799
stage: test-summary
799800
# Note: No explicit 'needs' or 'dependencies' required
800801
# By default, GitLab CI automatically downloads artifacts from ALL jobs in previous stages

0 commit comments

Comments
 (0)