Merge remote-tracking branch 'upstream/4.x' into flaky-test

SiyaoIsHiding · SiyaoIsHiding · commit c0d2f749e383 · 2025-07-14T23:03:10.000-07:00
diff --git a/Jenkinsfile-asf b/Jenkinsfile-asf
@@ -35,7 +35,7 @@ pipeline {
                 axes {
                     axis {
                         name 'TEST_JAVA_VERSION'
-                        values  'openjdk@1.8.0-292', 'openjdk@1.11.0-9', 'openjdk@17', 'openjdk@1.21.0'
+                        values  'openjdk@1.8.0-292', 'openjdk@1.11.0-9', 'openjdk@1.17.0', 'openjdk@1.21.0'
                     }
                     axis {
                         name 'SERVER_VERSION'
diff --git a/Jenkinsfile-datastax b/Jenkinsfile-datastax
@@ -402,7 +402,7 @@ pipeline {
   }
 
   environment {
-    OS_VERSION = 'ubuntu/bionic64/java-driver'
+    OS_VERSION = 'ubuntu/focal64/java-driver'
     JABBA_SHELL = '/usr/lib/jabba/jabba.sh'
     CCM_ENVIRONMENT_SHELL = '/usr/local/bin/ccm_environment.sh'
     SERIAL_ITS_ARGUMENT = "-DskipSerialITs=${params.SKIP_SERIAL_ITS}"

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ pipeline {`
`35`	`35`	`axes {`
`36`	`36`	`axis {`
`37`	`37`	`name 'TEST_JAVA_VERSION'`
`38`		`- values 'openjdk@1.8.0-292', 'openjdk@1.11.0-9', 'openjdk@17', 'openjdk@1.21.0'`
	`38`	`+ values 'openjdk@1.8.0-292', 'openjdk@1.11.0-9', 'openjdk@1.17.0', 'openjdk@1.21.0'`
`39`	`39`	`}`
`40`	`40`	`axis {`
`41`	`41`	`name 'SERVER_VERSION'`
Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ pipeline {`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`environment {`
`405`		`- OS_VERSION = 'ubuntu/bionic64/java-driver'`
	`405`	`+ OS_VERSION = 'ubuntu/focal64/java-driver'`
`406`	`406`	`JABBA_SHELL = '/usr/lib/jabba/jabba.sh'`
`407`	`407`	`CCM_ENVIRONMENT_SHELL = '/usr/local/bin/ccm_environment.sh'`
`408`	`408`	`SERIAL_ITS_ARGUMENT = "-DskipSerialITs=${params.SKIP_SERIAL_ITS}"`