From a2ffa73fcb84da338b066a6f52b918ea4a475479 Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Tue, 5 Nov 2024 12:39:59 -0500 Subject: [PATCH 1/2] Limit docker label to linux special.system --- pipelines/build/common/openjdk_build_pipeline.groovy | 6 +++--- pipelines/jobs/configurations/jdk21u_pipeline_config.groovy | 4 ++-- pipelines/jobs/configurations/jdk23u_pipeline_config.groovy | 6 ++++-- pipelines/jobs/configurations/jdk24_pipeline_config.groovy | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index fda611646..df3090bff 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -418,6 +418,8 @@ class Build { testStages["${testType}"] = { context.println "Running test: ${testType}" context.stage("${testType}") { + def jobParams = getAQATestJobParams(testType) + def jobName = jobParams.TEST_JOB_NAME def keep_test_reportdir = buildConfig.KEEP_TEST_REPORTDIR def rerunIterations = '1' if ("${testType}".contains('dev') || "${testType}".contains('external')) { @@ -433,7 +435,7 @@ class Build { DYNAMIC_COMPILE = true } def additionalTestLabel = buildConfig.ADDITIONAL_TEST_LABEL - if (testType == 'dev.openjdk' || testType == 'special.system') { + if (testType == 'dev.openjdk' || (testType == 'special.system' && jobName.contains('linux'))) { context.println "${testType} need extra label sw.tool.docker" if (additionalTestLabel == '') { additionalTestLabel = 'sw.tool.docker' @@ -452,9 +454,7 @@ class Build { vendorTestBranches = buildConfig.BUILD_REF ?: vendorTestBranches } - def jobParams = getAQATestJobParams(testType) - def jobName = jobParams.TEST_JOB_NAME String helperRef = buildConfig.HELPER_REF ?: DEFAULTS_JSON['repository']['helper_ref'] def JobHelper = context.library(identifier: "openjdk-jenkins-helper@${helperRef}").JobHelper diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy index ae549114f..e7208adbd 100644 --- a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy @@ -68,7 +68,7 @@ class Config21 { arch : 'x64', additionalNodeLabels: 'win2022&&vs2022', test: [ - weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system'] + weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system', 'special.system'] ], buildArgs : [ 'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' @@ -138,7 +138,7 @@ class Config21 { arch : 'aarch64', additionalNodeLabels: 'xcode15.0.1', test: [ - weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system'] + weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system', 'special.system'] ], buildArgs : [ 'temurin' : '--create-jre-image --create-sbom' diff --git a/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy index decb963f3..527995b43 100644 --- a/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy @@ -69,7 +69,7 @@ class Config23 { arch : 'x64', additionalNodeLabels: 'win2022&&vs2022', test: [ - weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system'] + weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system', 'special.system'] ], buildArgs : [ 'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' @@ -138,7 +138,9 @@ class Config23 { os : 'mac', arch : 'aarch64', additionalNodeLabels: 'xcode15.0.1', - test : 'default', + test: [ + weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system', 'special.system'] + ], buildArgs : [ 'temurin' : '--create-jre-image --create-sbom' ] diff --git a/pipelines/jobs/configurations/jdk24_pipeline_config.groovy b/pipelines/jobs/configurations/jdk24_pipeline_config.groovy index 0a2b50321..ebca0f466 100644 --- a/pipelines/jobs/configurations/jdk24_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk24_pipeline_config.groovy @@ -69,7 +69,7 @@ class Config24 { arch : 'x64', additionalNodeLabels: 'win2022&&vs2022', test: [ - weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system'] + weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system', 'special.system'] ], buildArgs : [ 'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' @@ -139,7 +139,7 @@ class Config24 { arch : 'aarch64', additionalNodeLabels: 'xcode15.0.1', test: [ - weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system'] + weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system', 'special.system'] ], buildArgs : [ 'temurin' : '--create-jre-image --create-sbom' From 7008c8128110d8a1f9411057a50b715888637ae8 Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Wed, 6 Nov 2024 09:30:55 -0500 Subject: [PATCH 2/2] limit to temurin --- pipelines/build/common/openjdk_build_pipeline.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index df3090bff..f7aefd09c 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -435,7 +435,8 @@ class Build { DYNAMIC_COMPILE = true } def additionalTestLabel = buildConfig.ADDITIONAL_TEST_LABEL - if (testType == 'dev.openjdk' || (testType == 'special.system' && jobName.contains('linux'))) { + // Eclipse Adoptium Temurin label speciall requirements for special.system on linux + if (testType == 'dev.openjdk' || (testType == 'special.system' && jobName.contains('linux') && buildConfig.VARIANT == 'temurin')) { context.println "${testType} need extra label sw.tool.docker" if (additionalTestLabel == '') { additionalTestLabel = 'sw.tool.docker'