Skip to content

Test new docker base image #8841

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

Closed
sarahchen6 wants to merge 7 commits into from
Closed

Test new docker base image #8841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5c9c7c5
Test new docker base image
sarahchen6 May 16, 2025
6cf5b3f
Remove edits
sarahchen6 May 16, 2025
f609f4c
Try changing DOCKER_IMAGE_VERSION
sarahchen6 May 16, 2025
ab886dd
Empty commit
sarahchen6 May 19, 2025
4d37f6a
Empty commit 1
sarahchen6 May 20, 2025
6572cf3
Empty commit 2
sarahchen6 May 21, 2025
7aba671
Try different paths
sarahchen6 May 21, 2025
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
21 changes: 11 additions & 10 deletions .circleci/config.continue.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .circleci/render_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading