Skip to content

Commit 986e4c8

Browse files
committed
Test Ubuntu 17 JDK fix
1 parent c4c5d62 commit 986e4c8

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

.gitlab-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ variables:
2727
GRADLE_VERSION: "8.5" # must match gradle-wrapper.properties
2828
MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/"
2929
GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/"
30-
JAVA_BUILD_IMAGE_VERSION: "v25.05"
30+
JAVA_BUILD_IMAGE_VERSION: "101_merge"
3131
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
32-
DEFAULT_TEST_JVMS: /^(8|11|17|21)$/
32+
DEFAULT_TEST_JVMS: /^(8|11|17|21|ubuntu17)$/
3333
PROFILE_TESTS:
3434
description: "Enable profiling of tests"
3535
value: "false"
@@ -366,7 +366,7 @@ muzzle-dep-report:
366366

367367
.test_job:
368368
extends: .gradle_build
369-
image: ghcr.io/datadog/dd-trace-java-docker-build:$testJvm
369+
image: ghcr.io/datadog/dd-trace-java-docker-build:${JAVA_BUILD_IMAGE_VERSION}-${testJvm}
370370
tags: [ "docker-in-docker:amd64" ] # use docker-in-docker runner for testcontainers
371371
needs: [ build_tests ]
372372
stage: tests
@@ -542,7 +542,7 @@ test_debugger:
542542
variables:
543543
GRADLE_TARGET: ":debuggerTest"
544544
CACHE_TYPE: "base"
545-
DEFAULT_TEST_JVMS: /^(8|11|17|21|semeru8)$/
545+
DEFAULT_TEST_JVMS: /^(8|11|17|21|semeru8|ubuntu17)$/
546546
parallel:
547547
matrix: *test_matrix
548548

0 commit comments

Comments
 (0)