From 5c9c7c5b91f50da397eee52fa016f79da6d00e4b Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Fri, 16 May 2025 11:06:45 -0400 Subject: [PATCH 1/7] Test new docker base image --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f175868c407..1e1ae397922 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,7 +103,7 @@ default: - echo "NORMALIZED_NODE_TOTAL=${NORMALIZED_NODE_TOTAL}, NORMALIZED_NODE_INDEX=$NORMALIZED_NODE_INDEX" .gradle_build: &gradle_build - image: ghcr.io/datadog/dd-trace-java-docker-build:${JAVA_BUILD_IMAGE_VERSION}-base + image: ghcr.io/datadog/dd-trace-java-docker-build:95_merge-${JAVA_BUILD_IMAGE_VERSION}-base stage: build variables: MAVEN_OPTS: "-Xms64M -Xmx512M" @@ -234,7 +234,7 @@ spotless: test_published_artifacts: extends: .gradle_build - image: ghcr.io/datadog/dd-trace-java-docker-build:${JAVA_BUILD_IMAGE_VERSION}-7 # Needs Java7 for some tests + image: ghcr.io/datadog/dd-trace-java-docker-build:95_merge-${JAVA_BUILD_IMAGE_VERSION}-7 # Needs Java7 for some tests stage: tests needs: [ build ] variables: @@ -372,7 +372,7 @@ muzzle-dep-report: .test_job: extends: .gradle_build - image: ghcr.io/datadog/dd-trace-java-docker-build:$testJvm + image: ghcr.io/datadog/dd-trace-java-docker-build:95_merge-$testJvm tags: [ "docker-in-docker:amd64" ] # use docker-in-docker runner for testcontainers needs: [ build_tests ] stage: tests From 6cf5b3f985690f4fb6964a4246ee4060c8561903 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Fri, 16 May 2025 11:20:22 -0400 Subject: [PATCH 2/7] Remove edits --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e1ae397922..f175868c407 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,7 +103,7 @@ default: - echo "NORMALIZED_NODE_TOTAL=${NORMALIZED_NODE_TOTAL}, NORMALIZED_NODE_INDEX=$NORMALIZED_NODE_INDEX" .gradle_build: &gradle_build - image: ghcr.io/datadog/dd-trace-java-docker-build:95_merge-${JAVA_BUILD_IMAGE_VERSION}-base + image: ghcr.io/datadog/dd-trace-java-docker-build:${JAVA_BUILD_IMAGE_VERSION}-base stage: build variables: MAVEN_OPTS: "-Xms64M -Xmx512M" @@ -234,7 +234,7 @@ spotless: test_published_artifacts: extends: .gradle_build - image: ghcr.io/datadog/dd-trace-java-docker-build:95_merge-${JAVA_BUILD_IMAGE_VERSION}-7 # Needs Java7 for some tests + image: ghcr.io/datadog/dd-trace-java-docker-build:${JAVA_BUILD_IMAGE_VERSION}-7 # Needs Java7 for some tests stage: tests needs: [ build ] variables: @@ -372,7 +372,7 @@ muzzle-dep-report: .test_job: extends: .gradle_build - image: ghcr.io/datadog/dd-trace-java-docker-build:95_merge-$testJvm + image: ghcr.io/datadog/dd-trace-java-docker-build:$testJvm tags: [ "docker-in-docker:amd64" ] # use docker-in-docker runner for testcontainers needs: [ build_tests ] stage: tests From f609f4c537b453b8a8fb7863d2218d9f451c7c66 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Fri, 16 May 2025 11:26:58 -0400 Subject: [PATCH 3/7] Try changing DOCKER_IMAGE_VERSION --- .circleci/render_config.py | 2 +- .gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/render_config.py b/.circleci/render_config.py index c9a7299148c..7e781d0bb40 100755 --- a/.circleci/render_config.py +++ b/.circleci/render_config.py @@ -30,7 +30,7 @@ } # Version to use for all the base Docker images, see # https://github.com/DataDog/dd-trace-java-docker-build/pkgs/container/dd-trace-java-docker-build -DOCKER_IMAGE_VERSION="v25.01" +DOCKER_IMAGE_VERSION="95_merge" # Get labels from pull requests to override some defaults for jobs to run. # `run-tests: all` will run all tests. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f175868c407..aa69b8887d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ variables: GRADLE_VERSION: "8.4" # must match gradle-wrapper.properties MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/" GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/" - JAVA_BUILD_IMAGE_VERSION: "v25.01" + JAVA_BUILD_IMAGE_VERSION: "95_merge" REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations" DEFAULT_TEST_JVMS: /^(8|11|17|21)$/ PROFILE_TESTS: From ab886dd795fd2be0a8870238578c7a72fae400c4 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Mon, 19 May 2025 15:10:33 +0200 Subject: [PATCH 4/7] Empty commit From 4d37f6aa408355e32d5b72bb4fb314afb7fba701 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 20 May 2025 16:29:42 +0200 Subject: [PATCH 5/7] Empty commit 1 From 6572cf3e940bb3384d4adbe926377fe72dc2a2d4 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 21 May 2025 11:53:15 +0200 Subject: [PATCH 6/7] Empty commit 2 From 7aba6710d206a3ef5f8f590006f88394026c915a Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 21 May 2025 16:02:29 +0200 Subject: [PATCH 7/7] Try different paths --- .circleci/config.continue.yml.j2 | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2 index fb9d4749e17..5de76817c06 100644 --- a/.circleci/config.continue.yml.j2 +++ b/.circleci/config.continue.yml.j2 @@ -778,8 +778,9 @@ jobs: - run: name: Copy jar file to system test binaries folder command: | - ls -la ~/dd-trace-java/workspace/dd-java-agent/build/libs - cp ~/dd-trace-java/workspace/dd-java-agent/build/libs/*.jar system-tests/binaries/ + pwd + ls -la /home/non-root-user/dd-trace-java/workspace/dd-java-agent/build/libs + cp /home/non-root-user/dd-trace-java/workspace/dd-java-agent/build/libs/*.jar system-tests/binaries/ - run: name: Build @@ -849,8 +850,8 @@ jobs: - run: name: Copy jar file to system test binaries folder command: | - ls -la ~/dd-trace-java/workspace/dd-java-agent/build/libs - cp ~/dd-trace-java/workspace/dd-java-agent/build/libs/*.jar system-tests/binaries/ + ls -la /home/non-root-user/dd-trace-java/workspace/dd-java-agent/build/libs + cp /home/non-root-user/dd-trace-java/workspace/dd-java-agent/build/libs/*.jar system-tests/binaries/ - run: name: Build @@ -882,8 +883,8 @@ jobs: - run: name: Copy jar file to system test binaries folder command: | - ls -la ~/dd-trace-java/workspace/dd-java-agent/build/libs - cp ~/dd-trace-java/workspace/dd-java-agent/build/libs/*.jar system-tests/binaries/ + ls -la /home/non-root-user/dd-trace-java/dd-java-agent/build/libs + cp /home/non-root-user/dd-trace-java/dd-java-agent/build/libs/*.jar system-tests/binaries/ - run: name: Build @@ -926,10 +927,10 @@ jobs: - run: name: Copy jar files to system test binaries folder command: | - ls -la ~/dd-trace-java/workspace/dd-trace-api/build/libs - ls -la ~/dd-trace-java/workspace/dd-java-agent/build/libs - cp ~/dd-trace-java/workspace/dd-trace-api/build/libs/*.jar system-tests/binaries/ - cp ~/dd-trace-java/workspace/dd-java-agent/build/libs/*.jar system-tests/binaries/ + ls -la /home/non-root-user/dd-trace-api/build/libs + ls -la /home/non-root-user/dd-java-agent/build/libs + cp /home/non-root-user/dd-trace-api/build/libs/*.jar system-tests/binaries/ + cp /home/non-root-user/dd-java-agent/build/libs/*.jar system-tests/binaries/ - run: