From 5550e2f14ff2beb04c60c4bedeafbafd558c537e Mon Sep 17 00:00:00 2001 From: Lan Xia Date: Fri, 13 Sep 2024 12:08:39 -0400 Subject: [PATCH] Add support for nightly and weekly run (#5604) Signed-off-by: Lan Xia --- buildenv/jenkins/aqaTestPipeline.groovy | 7 ++- .../config/openj9/nightly/default.json | 15 +++++++ .../jenkins/config/openj9/nightly/jdk8.json | 15 +++++++ .../config/openj9/{ => release}/default.json | 2 +- .../config/openj9/{ => release}/jdk8.json | 3 +- .../jenkins/config/openj9/weekly/default.json | 43 +++++++++++++++++++ .../jenkins/config/openj9/weekly/jdk8.json | 23 ++++++++++ 7 files changed, 103 insertions(+), 5 deletions(-) create mode 100644 buildenv/jenkins/config/openj9/nightly/default.json create mode 100644 buildenv/jenkins/config/openj9/nightly/jdk8.json rename buildenv/jenkins/config/openj9/{ => release}/default.json (97%) rename buildenv/jenkins/config/openj9/{ => release}/jdk8.json (89%) create mode 100644 buildenv/jenkins/config/openj9/weekly/default.json create mode 100644 buildenv/jenkins/config/openj9/weekly/jdk8.json diff --git a/buildenv/jenkins/aqaTestPipeline.groovy b/buildenv/jenkins/aqaTestPipeline.groovy index 15604e67f7..2aecd3df6a 100644 --- a/buildenv/jenkins/aqaTestPipeline.groovy +++ b/buildenv/jenkins/aqaTestPipeline.groovy @@ -31,12 +31,15 @@ currentBuild.setDisplayName(PIPELINE_DISPLAY_NAME) def defaultTestTargets = "sanity.functional,extended.functional,special.functional,sanity.openjdk,extended.openjdk,special.openjdk,sanity.system,extended.system,special.system,sanity.perf,extended.perf,sanity.jck,extended.jck,special.jck" def defaultFipsTestTargets = "extended.functional,sanity.openjdk,extended.openjdk,sanity.jck,extended.jck,special.jck" +if (params.BUILD_TYPE == "nightly") { + defaultTestTargets = "sanity.functional,extended.functional,sanity.openjdk,extended.openjdk,sanity.perf,sanity.jck,sanity.system,special.system" +} JOBS = [:] fail = false JDK_VERSIONS.each { JDK_VERSION -> - if (params.PLATFORMS == "release") { + if (params.BUILD_TYPE == "release" || params.BUILD_TYPE == "nightly" || params.BUILD_TYPE == "weekly") { def configJson = [] if (params.CONFIG_JSON) { echo "Read JSON from CONFIG_JSON parameter..." @@ -45,7 +48,7 @@ JDK_VERSIONS.each { JDK_VERSION -> node("worker || (ci.role.test&&hw.arch.x86&&sw.os.linux)") { checkout scm dir (env.WORKSPACE) { - def filePath = "./aqa-tests/buildenv/jenkins/config/${params.VARIANT}/" + def filePath = "./aqa-tests/buildenv/jenkins/config/${params.VARIANT}/${params.BUILD_TYPE}/" filePath = filePath + "default.json" if (fileExists(filePath + "jdk${JDK_VERSION}.json")) { filePath = filePath + "jdk${JDK_VERSION}.json" diff --git a/buildenv/jenkins/config/openj9/nightly/default.json b/buildenv/jenkins/config/openj9/nightly/default.json new file mode 100644 index 0000000000..906eab9141 --- /dev/null +++ b/buildenv/jenkins/config/openj9/nightly/default.json @@ -0,0 +1,15 @@ +[ + { + "TEST_FLAG" : "NONE", + "PLATFORM_TARGETS" : [ + { "aarch64_linux" : "defaultTestTargets" }, + { "aarch64_mac" : "defaultTestTargets" }, + { "ppc64_aix" : "defaultTestTargets" }, + { "ppc64le_linux" : "defaultTestTargets" }, + { "s390x_linux" : "defaultTestTargets" }, + { "x86-64_linux" : "defaultTestTargets" }, + { "x86-64_mac" : "defaultTestTargets" }, + { "x86-64_windows" : "defaultTestTargets" } + ] + } +] \ No newline at end of file diff --git a/buildenv/jenkins/config/openj9/nightly/jdk8.json b/buildenv/jenkins/config/openj9/nightly/jdk8.json new file mode 100644 index 0000000000..1f87bde179 --- /dev/null +++ b/buildenv/jenkins/config/openj9/nightly/jdk8.json @@ -0,0 +1,15 @@ +[ + { + "TEST_FLAG" : "NONE", + "PLATFORM_TARGETS" : [ + { "aarch64_linux" : "defaultTestTargets" }, + { "ppc64_aix" : "defaultTestTargets" }, + { "ppc64le_linux" : "defaultTestTargets" }, + { "s390x_linux" : "defaultTestTargets" }, + { "x86-64_linux" : "defaultTestTargets" }, + { "x86-64_mac" : "defaultTestTargets" }, + { "x86-64_windows" : "defaultTestTargets" }, + { "x86-32_windows" : "defaultTestTargets" } + ] + } +] \ No newline at end of file diff --git a/buildenv/jenkins/config/openj9/default.json b/buildenv/jenkins/config/openj9/release/default.json similarity index 97% rename from buildenv/jenkins/config/openj9/default.json rename to buildenv/jenkins/config/openj9/release/default.json index 3a63047048..3d9896113b 100644 --- a/buildenv/jenkins/config/openj9/default.json +++ b/buildenv/jenkins/config/openj9/release/default.json @@ -13,7 +13,7 @@ ] }, { - "TEST_FLAG" : "FIPS140_2", + "TEST_FLAG" : "FIPS140_2", "PLATFORM_TARGETS" : [ { "ppc64le_linux" : "defaultFipsTestTargets" }, { "s390x_linux" : "defaultFipsTestTargets" }, diff --git a/buildenv/jenkins/config/openj9/jdk8.json b/buildenv/jenkins/config/openj9/release/jdk8.json similarity index 89% rename from buildenv/jenkins/config/openj9/jdk8.json rename to buildenv/jenkins/config/openj9/release/jdk8.json index bb08df58a4..f13efcb999 100644 --- a/buildenv/jenkins/config/openj9/jdk8.json +++ b/buildenv/jenkins/config/openj9/release/jdk8.json @@ -3,7 +3,6 @@ "TEST_FLAG" : "NONE", "PLATFORM_TARGETS" : [ { "aarch64_linux" : "defaultTestTargets" }, - { "aarch64_mac" : "defaultTestTargets" }, { "ppc64_aix" : "defaultTestTargets" }, { "ppc64le_linux" : "defaultTestTargets" }, { "s390x_linux" : "defaultTestTargets" }, @@ -14,7 +13,7 @@ ] }, { - "TEST_FLAG" : "FIPS140_2", + "TEST_FLAG" : "FIPS140_2", "PLATFORM_TARGETS" : [ { "ppc64le_linux" : "defaultFipsTestTargets" }, { "s390x_linux" : "defaultFipsTestTargets" }, diff --git a/buildenv/jenkins/config/openj9/weekly/default.json b/buildenv/jenkins/config/openj9/weekly/default.json new file mode 100644 index 0000000000..2b8089b471 --- /dev/null +++ b/buildenv/jenkins/config/openj9/weekly/default.json @@ -0,0 +1,43 @@ +[ + { + "TEST_FLAG" : "NONE", + "PLATFORM_TARGETS" : [ + { "aarch64_linux" : "defaultTestTargets,dev.external,dev.functional,dev.openjdk" }, + { "aarch64_mac" : "defaultTestTargets" }, + { "ppc64_aix" : "defaultTestTargets" }, + { "ppc64le_linux" : "defaultTestTargets,dev.external,dev.functional,dev.openjdk" }, + { "s390x_linux" : "defaultTestTargets,dev.external,dev.functional,dev.openjdk" }, + { "x86-64_linux" : "defaultTestTargets,dev.external,dev.functional,dev.openjdk" }, + { "x86-64_mac" : "defaultTestTargets" }, + { "x86-64_windows" : "defaultTestTargets" } + ] + }, + { + "TEST_FLAG" : "FIPS140_2", + "PLATFORM_TARGETS" : [ + { "ppc64le_linux" : "defaultFipsTestTargets" }, + { "s390x_linux" : "defaultFipsTestTargets" }, + { "x86-64_linux" : "defaultFipsTestTargets" } + ] + }, + { + "TEST_FLAG" : "FIPS140_3_OpenJCEPlusFIPS", + "PLATFORM_TARGETS" : [ + { "ppc64_aix" : "defaultFipsTestTargets" }, + { "ppc64le_linux" : "defaultFipsTestTargets" }, + { "s390x_linux" : "defaultFipsTestTargets" }, + { "x86-64_linux" : "defaultFipsTestTargets" }, + { "x86-64_windows" : "defaultFipsTestTargets" } + ] + }, + { + "TEST_FLAG" : "FIPS140_3_OpenJCEPlusFIPS.FIPS140-3", + "PLATFORM_TARGETS" : [ + { "ppc64_aix" : "defaultFipsTestTargets" }, + { "ppc64le_linux" : "defaultFipsTestTargets" }, + { "s390x_linux" : "defaultFipsTestTargets" }, + { "x86-64_linux" : "defaultFipsTestTargets" }, + { "x86-64_windows" : "defaultFipsTestTargets" } + ] + } +] \ No newline at end of file diff --git a/buildenv/jenkins/config/openj9/weekly/jdk8.json b/buildenv/jenkins/config/openj9/weekly/jdk8.json new file mode 100644 index 0000000000..f9dc0ca576 --- /dev/null +++ b/buildenv/jenkins/config/openj9/weekly/jdk8.json @@ -0,0 +1,23 @@ +[ + { + "TEST_FLAG" : "NONE", + "PLATFORM_TARGETS" : [ + { "aarch64_linux" : "defaultTestTargets,dev.functional" }, + { "ppc64_aix" : "defaultTestTargets" }, + { "ppc64le_linux" : "defaultTestTargets,dev.functional" }, + { "s390x_linux" : "defaultTestTargets,dev.functional" }, + { "x86-64_linux" : "defaultTestTargets,dev.functional" }, + { "x86-64_mac" : "defaultTestTargets" }, + { "x86-64_windows" : "defaultTestTargets" }, + { "x86-32_windows" : "defaultTestTargets" } + ] + }, + { + "TEST_FLAG" : "FIPS140_2", + "PLATFORM_TARGETS" : [ + { "ppc64le_linux" : "defaultFipsTestTargets" }, + { "s390x_linux" : "defaultFipsTestTargets" }, + { "x86-64_linux" : "defaultFipsTestTargets" } + ] + } +] \ No newline at end of file