From 12e569487b323e65602faf9f2f0ae14297139dd0 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Tue, 9 Jan 2024 10:47:04 -0700 Subject: [PATCH 01/10] Test Linux with JDK 21 Exploring the out of memory error report from the Java 21 agents when packaging the war file. * https://github.com/jenkins-infra/helpdesk/issues/3874 --- Jenkinsfile | 71 ++++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2913ec74060b..02680109b1fa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,8 @@ * It makes assumptions about plugins being installed, labels mapping to nodes that can build what is needed, etc. */ -def failFast = false +// def failFast = false +def failFast = true properties([ buildDiscarder(logRotator(numToKeepStr: '50', artifactNumToKeepStr: '3')), @@ -13,8 +14,10 @@ properties([ ]) def axes = [ - platforms: ['linux', 'windows'], - jdks: [11, 17, 21], + // platforms: ['linux', 'windows'], + platforms: ['linux'], + // jdks: [11, 17, 21], + jdks: [21], ] stage('Record build') { @@ -206,37 +209,37 @@ axes.values().combinations { } } -def athAxes = [ - platforms: ['linux'], - jdks: [17], - browsers: ['firefox'], -] -athAxes.values().combinations { - def (platform, jdk, browser) = it - builds["ath-${platform}-jdk${jdk}-${browser}"] = { - retry(conditions: [agent(), nonresumable()], count: 2) { - node('docker-highmem') { - // Just to be safe - deleteDir() - checkout scm - infra.withArtifactCachingProxy { - sh "bash ath.sh ${jdk} ${browser}" - } - junit testResults: 'target/ath-reports/TEST-*.xml', testDataPublishers: [[$class: 'AttachmentPublisher']] - /* - * Currently disabled, as the fact that this is a manually created subset will confuse Launchable, - * which expects this to be a full build. When we implement subsetting, this can be re-enabled using - * Launchable's subset rather than our own. - */ - /* - withCredentials([string(credentialsId: 'launchable-jenkins-acceptance-test-harness', variable: 'LAUNCHABLE_TOKEN')]) { - sh "launchable verify && launchable record tests --no-build --flavor platform=${platform} --flavor jdk=${jdk} --flavor browser=${browser} maven './target/ath-reports'" - } - */ - } - } - } -} +// def athAxes = [ +// platforms: ['linux'], +// jdks: [17], +// browsers: ['firefox'], +// ] +// athAxes.values().combinations { +// def (platform, jdk, browser) = it +// builds["ath-${platform}-jdk${jdk}-${browser}"] = { +// retry(conditions: [agent(), nonresumable()], count: 2) { +// node('docker-highmem') { +// // Just to be safe +// deleteDir() +// checkout scm +// infra.withArtifactCachingProxy { +// sh "bash ath.sh ${jdk} ${browser}" +// } +// junit testResults: 'target/ath-reports/TEST-*.xml', testDataPublishers: [[$class: 'AttachmentPublisher']] +// /* +// * Currently disabled, as the fact that this is a manually created subset will confuse Launchable, +// * which expects this to be a full build. When we implement subsetting, this can be re-enabled using +// * Launchable's subset rather than our own. +// */ +// /* +// withCredentials([string(credentialsId: 'launchable-jenkins-acceptance-test-harness', variable: 'LAUNCHABLE_TOKEN')]) { +// sh "launchable verify && launchable record tests --no-build --flavor platform=${platform} --flavor jdk=${jdk} --flavor browser=${browser} maven './target/ath-reports'" +// } +// */ +// } +// } +// } +// } builds.failFast = failFast parallel builds From 77d13500b43444a3b1087b35e78a177242fe2666 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Tue, 9 Jan 2024 11:53:14 -0700 Subject: [PATCH 02/10] Allocate 1.4GB heap, not 1.1GB --- .mvn/jvm.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/jvm.config b/.mvn/jvm.config index f0106d148540..1d72cb7d8d93 100644 --- a/.mvn/jvm.config +++ b/.mvn/jvm.config @@ -1 +1 @@ --Xmx1100m +-Xmx1400m From 5b73190b2969430f6f4118492d98fc00fa21a22f Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Tue, 9 Jan 2024 13:30:15 -0700 Subject: [PATCH 03/10] Revert "Allocate 1.4GB heap, not 1.1GB" This reverts commit 77d13500b43444a3b1087b35e78a177242fe2666. --- .mvn/jvm.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/jvm.config b/.mvn/jvm.config index 1d72cb7d8d93..f0106d148540 100644 --- a/.mvn/jvm.config +++ b/.mvn/jvm.config @@ -1 +1 @@ --Xmx1400m +-Xmx1100m From e476e9e1695b43655217d00a58cc648aa2a74bfe Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Thu, 11 Jan 2024 05:36:59 -0700 Subject: [PATCH 04/10] Only run a few tests Failure is in war packaging, tests may not matter --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 02680109b1fa..0ba3099fe983 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -92,6 +92,7 @@ axes.values().combinations { session = readFile(sessionFile).trim() } def mavenOptions = [ + '-Dtest=FilePathTest', '-Pdebug', '-Penable-jacoco', '--update-snapshots', From 3ce4856f16685ad11309af86b4c74ee83fda7dcb Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Tue, 9 Jan 2024 11:53:14 -0700 Subject: [PATCH 05/10] Allocate 1.4GB heap, not 1.1GB --- .mvn/jvm.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/jvm.config b/.mvn/jvm.config index f0106d148540..1d72cb7d8d93 100644 --- a/.mvn/jvm.config +++ b/.mvn/jvm.config @@ -1 +1 @@ --Xmx1100m +-Xmx1400m From c0092e3e4d9041323d1501613434e38d904a64dc Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Tue, 9 Jan 2024 11:53:14 -0700 Subject: [PATCH 06/10] Allocate 1.4GB heap, not 1.1GB --- .mvn/jvm.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/jvm.config b/.mvn/jvm.config index f0106d148540..1d72cb7d8d93 100644 --- a/.mvn/jvm.config +++ b/.mvn/jvm.config @@ -1 +1 @@ --Xmx1100m +-Xmx1400m From ba140f601c97e3e3208cba49661d2342d266a59e Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Tue, 9 Jan 2024 11:53:14 -0700 Subject: [PATCH 07/10] Allocate 1.4GB heap, not 1.1GB --- .mvn/jvm.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/jvm.config b/.mvn/jvm.config index f0106d148540..1d72cb7d8d93 100644 --- a/.mvn/jvm.config +++ b/.mvn/jvm.config @@ -1 +1 @@ --Xmx1100m +-Xmx1400m From 84de78178def7759d4c2383af0347a3b0b527ea5 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Tue, 9 Jan 2024 11:53:14 -0700 Subject: [PATCH 08/10] Allocate 1.4GB heap, not 1.1GB --- .mvn/jvm.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/jvm.config b/.mvn/jvm.config index f0106d148540..1d72cb7d8d93 100644 --- a/.mvn/jvm.config +++ b/.mvn/jvm.config @@ -1 +1 @@ --Xmx1100m +-Xmx1400m From 9f272392e43f135740e394afa518e29caaa79205 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Thu, 11 Jan 2024 19:20:12 -0700 Subject: [PATCH 09/10] Start a build From 7b0cab1d957aa9b59f52ed7785c9d8914a251aa7 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Thu, 11 Jan 2024 19:58:23 -0700 Subject: [PATCH 10/10] Start another build