From 4e1e90c022d6e9a5e38da594aea252776f19cc73 Mon Sep 17 00:00:00 2001 From: Mesbah Alam Date: Tue, 14 Mar 2023 15:23:34 -0400 Subject: [PATCH] Enable dev.openjdk on only Linux platforms Signed-off-by: Mesbah Alam --- pipelines/defaults.json | 1 - .../jdk11u_pipeline_config.groovy | 12 ++-- .../jdk17u_pipeline_config.groovy | 31 +++++++-- .../jdk19u_pipeline_config.groovy | 69 +++++++++++++++++-- .../jdk20_pipeline_config.groovy | 69 +++++++++++++++++-- .../jdk8u_pipeline_config.groovy | 31 +++++++-- 6 files changed, 192 insertions(+), 21 deletions(-) diff --git a/pipelines/defaults.json b/pipelines/defaults.json index 1beba029f..f02a19379 100644 --- a/pipelines/defaults.json +++ b/pipelines/defaults.json @@ -56,7 +56,6 @@ "extended.system", "special.functional", "special.jck", - "dev.openjdk", "dev.system" ], "disabled" : [ diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy index ae951a632..272d0cf9d 100644 --- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy @@ -282,7 +282,8 @@ class Config11 { 'extended.openjdk.fips', 'sanity.system.fips', 'extended.system.fips', - 'special.system.fips' + 'special.system.fips', + 'dev.openjdk' ] ], configureArgs : [ @@ -361,7 +362,8 @@ class Config11 { 'extended.system', 'special.functional', 'special.jck', - 'sanity.external' + 'sanity.external', + 'dev.openjdk' ] ], additionalNodeLabels: [ @@ -392,7 +394,8 @@ class Config11 { 'extended.system', 'special.functional', 'special.jck', - 'sanity.external' + 'sanity.external', + 'dev.openjdk' ] ], additionalNodeLabels: [ @@ -431,7 +434,8 @@ class Config11 { 'extended.system', 'special.functional', 'special.jck', - 'sanity.external' + 'sanity.external', + 'dev.openjdk' ] ], configureArgs : [ diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy index 540225d96..4a786c038 100644 --- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy @@ -269,7 +269,8 @@ class Config17 { 'extended.openjdk.fips', 'sanity.system.fips', 'extended.system.fips', - 'special.system.fips' + 'special.system.fips', + 'dev.openjdk' ] ], additionalTestLabels: [ @@ -332,7 +333,8 @@ class Config17 { 'extended.system', 'special.functional', 'special.jck', - 'sanity.external' + 'sanity.external', + 'dev.openjdk' ] ], additionalNodeLabels: [ @@ -363,7 +365,8 @@ class Config17 { 'extended.system', 'special.functional', 'special.jck', - 'sanity.external' + 'sanity.external', + 'dev.openjdk' ] ], additionalNodeLabels: [ @@ -382,7 +385,27 @@ class Config17 { dockerImage : 'adoptopenjdk/centos7_build_image', dockerNode : 'sw.tool.docker', dockerCredential : '9f50c848-8764-440d-b95a-1d295c21713e', - test : 'default', + test : [ + nightly: [ + 'sanity.functional', + 'extended.functional', + 'sanity.openjdk', + 'sanity.perf', + 'sanity.jck', + 'sanity.system', + 'special.system' + ], + weekly : [ + 'extended.openjdk', + 'extended.perf', + 'extended.jck', + 'extended.system', + 'special.functional', + 'special.jck', + 'dev.system', + 'dev.openjdk' + ] + ], additionalNodeLabels: [ openj9: 'hw.arch.aarch64 && sw.os.linux' ], diff --git a/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy index c7cd269f4..4d8a52aa5 100644 --- a/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy @@ -64,7 +64,8 @@ class Config19 { 'extended.openjdk.fips', 'sanity.system.fips', 'extended.system.fips', - 'special.system.fips' + 'special.system.fips', + 'dev.openjdk' ] ], cleanWorkspaceAfterBuild: true, @@ -172,7 +173,27 @@ class Config19 { s390xLinux : [ os : 'linux', arch : 's390x', - test : 'default', + test : [ + nightly: [ + 'sanity.functional', + 'extended.functional', + 'sanity.openjdk', + 'sanity.perf', + 'sanity.jck', + 'sanity.system', + 'special.system' + ], + weekly : [ + 'extended.openjdk', + 'extended.perf', + 'extended.jck', + 'extended.system', + 'special.functional', + 'special.jck', + 'dev.system', + 'dev.openjdk' + ] + ], cleanWorkspaceAfterBuild: true, additionalNodeLabels: 'hw.arch.s390x && (sw.os.cent.7 || sw.os.rhel.7)', bootJDK : '18', @@ -189,7 +210,27 @@ class Config19 { ppc64leLinux : [ os : 'linux', arch : 'ppc64le', - test : 'default', + test : [ + nightly: [ + 'sanity.functional', + 'extended.functional', + 'sanity.openjdk', + 'sanity.perf', + 'sanity.jck', + 'sanity.system', + 'special.system' + ], + weekly : [ + 'extended.openjdk', + 'extended.perf', + 'extended.jck', + 'extended.system', + 'special.functional', + 'special.jck', + 'dev.system', + 'dev.openjdk' + ] + ], cleanWorkspaceAfterBuild: true, additionalNodeLabels: 'hw.arch.ppc64le && (sw.os.cent.7 || sw.os.rhel.7)', bootJDK : '18', @@ -212,7 +253,27 @@ class Config19 { dockerImage : 'adoptopenjdk/centos7_build_image@sha256:8947557de41e8b5fb0b0e067144b30f7771b182f0f571c12afad846aed6bc6be', dockerNode : 'sw.tool.docker', dockerCredential : '9f50c848-8764-440d-b95a-1d295c21713e', - test : 'default', + test : [ + nightly: [ + 'sanity.functional', + 'extended.functional', + 'sanity.openjdk', + 'sanity.perf', + 'sanity.jck', + 'sanity.system', + 'special.system' + ], + weekly : [ + 'extended.openjdk', + 'extended.perf', + 'extended.jck', + 'extended.system', + 'special.functional', + 'special.jck', + 'dev.system', + 'dev.openjdk' + ] + ], bootJDK : '18', configureArgs : [ temurin : '--enable-dtrace', diff --git a/pipelines/jobs/configurations/jdk20_pipeline_config.groovy b/pipelines/jobs/configurations/jdk20_pipeline_config.groovy index ecd4f1a8a..a43d80c06 100644 --- a/pipelines/jobs/configurations/jdk20_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk20_pipeline_config.groovy @@ -50,7 +50,8 @@ class Config20 { "extended.openjdk.fips", "sanity.system.fips", "extended.system.fips", - "special.system.fips" + "special.system.fips", + 'dev.openjdk' ] ], additionalTestLabels: [ @@ -117,7 +118,27 @@ class Config20 { s390xLinux : [ os : 'linux', arch : 's390x', - test : 'default', + test : [ + nightly: [ + 'sanity.functional', + 'extended.functional', + 'sanity.openjdk', + 'sanity.perf', + 'sanity.jck', + 'sanity.system', + 'special.system' + ], + weekly : [ + 'extended.openjdk', + 'extended.perf', + 'extended.jck', + 'extended.system', + 'special.functional', + 'special.jck', + 'dev.system', + 'dev.openjdk' + ] + ], configureArgs : '--enable-dtrace', buildArgs : [ 'temurin' : '--create-jre-image --create-sbom' @@ -127,7 +148,27 @@ class Config20 { ppc64leLinux : [ os : 'linux', arch : 'ppc64le', - test : 'default', + test : [ + nightly: [ + 'sanity.functional', + 'extended.functional', + 'sanity.openjdk', + 'sanity.perf', + 'sanity.jck', + 'sanity.system', + 'special.system' + ], + weekly : [ + 'extended.openjdk', + 'extended.perf', + 'extended.jck', + 'extended.system', + 'special.functional', + 'special.jck', + 'dev.system', + 'dev.openjdk' + ] + ], configureArgs : [ 'temurin' : '--enable-dtrace', 'openj9' : '--enable-dtrace' @@ -141,7 +182,27 @@ class Config20 { os : 'linux', arch : 'aarch64', dockerImage : 'adoptopenjdk/centos7_build_image', - test : 'default', + test : [ + nightly: [ + 'sanity.functional', + 'extended.functional', + 'sanity.openjdk', + 'sanity.perf', + 'sanity.jck', + 'sanity.system', + 'special.system' + ], + weekly : [ + 'extended.openjdk', + 'extended.perf', + 'extended.jck', + 'extended.system', + 'special.functional', + 'special.jck', + 'dev.system', + 'dev.openjdk' + ] + ], configureArgs : '--enable-dtrace', testDynamic : false, buildArgs : [ diff --git a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy index 11469cd58..d3d803316 100644 --- a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy @@ -56,7 +56,8 @@ class Config8 { 'extended.openjdk.fips', 'sanity.system.fips', 'extended.system.fips', - 'special.system.fips' + 'special.system.fips', + 'dev.openjdk' ] ], configureArgs : [ @@ -163,7 +164,8 @@ class Config8 { 'extended.system', 'special.functional', 'special.jck', - 'sanity.external' + 'sanity.external', + 'dev.openjdk' ] ], buildArgs : [ @@ -209,7 +211,8 @@ class Config8 { 'extended.system', 'special.functional', 'special.jck', - 'sanity.external' + 'sanity.external', + 'dev.openjdk' ] ], cleanWorkspaceAfterBuild: true, @@ -250,7 +253,27 @@ class Config8 { ], configureArgs : '--with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition"', cleanWorkspaceAfterBuild: true, - test : 'default', + test : [ + nightly: [ + 'sanity.functional', + 'extended.functional', + 'sanity.openjdk', + 'sanity.perf', + 'sanity.jck', + 'sanity.system', + 'special.system' + ], + weekly : [ + 'extended.openjdk', + 'extended.perf', + 'extended.jck', + 'extended.system', + 'special.functional', + 'special.jck', + 'dev.system', + 'dev.openjdk' + ] + ], buildArgs : [ 'temurin' : '--create-sbom' ]