Skip to content

Commit bf38cf2

Browse files
committed
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> (cherry picked from commit fd65c0a)
1 parent e6fe2ab commit bf38cf2

3 files changed

Lines changed: 6 additions & 111 deletions

File tree

.github/workflows/README.md

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

9595
_Recovery:_ Manually trigger the action again.
9696

97-
### update-docker-build-image [🔗](update-docker-build-image.yaml)
98-
99-
_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).
100-
101-
_Action:_ Update the Docker build image used in GitLab CI with the latest tag.
102-
103-
_Recovery:_ Download artifacts and upload them manually to the related _download release_.
104-
105-
_Notes:_ Manually trigger the action again given the desired image tag as input.
106-
10797
### update-download-releases [🔗](update-download-releases.yaml)
10898

10999
_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: 6 additions & 5 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"
@@ -403,7 +404,7 @@ config-inversion-linter:
403404

404405
test_published_artifacts:
405406
extends: .gradle_build
406-
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}7 # Needs Java7 for some tests
407+
image: ${BUILDER_IMAGE_REPO}:${BUILDER_IMAGE_VERSION_PREFIX}7 # Needs Java7 for some tests
407408
stage: tests
408409
needs: [ build ]
409410
variables:
@@ -570,7 +571,7 @@ muzzle-dep-report:
570571

571572
.test_job:
572573
extends: .gradle_build
573-
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}$testJvm
574+
image: ${BUILDER_IMAGE_REPO}:${BUILDER_IMAGE_VERSION_PREFIX}$testJvm
574575
tags: [ "docker-in-docker:amd64" ] # use docker-in-docker runner for testcontainers
575576
needs: [ build_tests ]
576577
stage: tests
@@ -798,7 +799,7 @@ test_smoke_semeru8_debugger:
798799
testJvm: "semeru8"
799800

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

0 commit comments

Comments
 (0)