Skip to content

Pull CI images from registry.ddbuild.io #10744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sarahchen6 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Pull CI images from registry.ddbuild.io #10744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 0 additions & 96 deletions .github/workflows/update-docker-build-image.yaml
View file
Open in desktop

This file was deleted.

13 changes: 7 additions & 6 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ variables:
GRADLE_VERSION: "8.14.4" # must match gradle-wrapper.properties
MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
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-")
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
TESTER_IMAGE_VERSION_PREFIX: "" # set only when testing a new build from the dd-trace-java-docker-build repo (e.g. "138_merge-" corresponds to PR #138)
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
DEFAULT_TEST_JVMS: /^(8|11|17|21|25|tip)$/ # the latest "tip" version is 26
PROFILE_TESTS:
Expand Down Expand Up @@ -142,7 +143,7 @@ default:
fi

.gradle_build: &gradle_build
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
image: ${BUILDER_IMAGE_REPO}:${TESTER_IMAGE_VERSION_PREFIX}base
stage: build
variables:
MAVEN_OPTS: "-Xms256M -Xmx1024M"
Expand Down Expand Up @@ -218,7 +219,7 @@ default:
# on the central publisher portal, it invalidates the old one. This check prevents going further.
# See https://datadoghq.atlassian.net/wiki/x/Oog5OgE
maven-central-pre-release-check:
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
image: ${BUILDER_IMAGE_REPO}:${TESTER_IMAGE_VERSION_PREFIX}base
stage: .pre
rules:
- if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/'
Expand Down Expand Up @@ -399,7 +400,7 @@ config-inversion-linter:

test_published_artifacts:
extends: .gradle_build
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}7 # Needs Java7 for some tests
image: ${BUILDER_IMAGE_REPO}:${TESTER_IMAGE_VERSION_PREFIX}7 # Needs Java7 for some tests
stage: tests
needs: [ build ]
variables:
Expand Down Expand Up @@ -566,7 +567,7 @@ muzzle-dep-report:

.test_job:
extends: .gradle_build
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}$testJvm
image: ${BUILDER_IMAGE_REPO}:${TESTER_IMAGE_VERSION_PREFIX}$testJvm
tags: [ "docker-in-docker:amd64" ] # use docker-in-docker runner for testcontainers
needs: [ build_tests ]
stage: tests
Expand Down Expand Up @@ -794,7 +795,7 @@ test_smoke_semeru8_debugger:
testJvm: "semeru8"

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