From 11a9ccea151a6b5855e04614b8736fe86aa8a0e5 Mon Sep 17 00:00:00 2001
From: Shelley Lambert <slambert@gmail.com>
Date: Thu, 22 Oct 2020 09:33:36 -0400
Subject: [PATCH 1/4] Remove weekly test list due to lack of machines
Signed-off-by: Shelley Lambert <slambert@gmail.com>
---
pipelines/build/common/build_base_file.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy
index c3e40e8ae..521452dd4 100644
--- a/pipelines/build/common/build_base_file.groovy
+++ b/pipelines/build/common/build_base_file.groovy
@@ -58,8 +58,8 @@ class Builder implements Serializable {
final List<String> nightly = ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.external']
final List<String> weekly = [
- 'extended.openjdk', 'extended.perf', 'extended.external',
- 'special.openjdk','special.functional', 'special.system', 'special.perf'
+ /* 'extended.openjdk', 'extended.perf', 'extended.external',
+ 'special.openjdk','special.functional', 'special.system', 'special.perf' */
]
IndividualBuildConfig buildConfiguration(Map<String, ?> platformConfig, String variant) {
From a153d4ddcc6cfac892fcbf7ab38af32e75a2cb36 Mon Sep 17 00:00:00 2001
From: Shelley Lambert <slambert@gmail.com>
Date: Mon, 2 Nov 2020 20:03:09 -0500
Subject: [PATCH 2/4] Reduce weekly list and remove version overrides
Signed-off-by: Shelley Lambert <slambert@gmail.com>
---
pipelines/build/common/build_base_file.groovy | 7 ++-----
.../jobs/configurations/jdk11u_pipeline_config.groovy | 10 ++--------
.../jobs/configurations/jdk15u_pipeline_config.groovy | 5 +----
.../jobs/configurations/jdk8u_pipeline_config.groovy | 5 +----
4 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy
index 521452dd4..8ea04acb5 100644
--- a/pipelines/build/common/build_base_file.groovy
+++ b/pipelines/build/common/build_base_file.groovy
@@ -57,11 +57,8 @@ class Builder implements Serializable {
def currentBuild
final List<String> nightly = ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.external']
- final List<String> weekly = [
- /* 'extended.openjdk', 'extended.perf', 'extended.external',
- 'special.openjdk','special.functional', 'special.system', 'special.perf' */
- ]
-
+ final List<String> weekly = ['extended.openjdk', 'extended.perf', 'special.functional']
+
IndividualBuildConfig buildConfiguration(Map<String, ?> platformConfig, String variant) {
def additionalNodeLabels = formAdditionalBuildNodeLabels(platformConfig, variant)
diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
index 137f3b682..02522f4a8 100644
--- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
@@ -112,10 +112,7 @@ class Config11 {
arm32Linux : [
os : 'linux',
arch : 'arm',
- test : [
- nightly: ['sanity.openjdk'],
- weekly : []
- ],
+ test : 'default',
configureArgs : '--enable-dtrace=auto'
],
@@ -123,10 +120,7 @@ class Config11 {
os : 'linux',
arch : 'aarch64',
dockerImage : 'adoptopenjdk/centos7_build_image',
- test : [
- nightly: ['sanity.functional', 'extended.functional', 'sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.external'],
- weekly : ['extended.openjdk', 'extended.perf', 'extended.external', 'special.openjdk','special.functional', 'special.system', 'special.perf']
- ],
+ test : 'default',
configureArgs : '--enable-dtrace=auto'
],
diff --git a/pipelines/jobs/configurations/jdk15u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk15u_pipeline_config.groovy
index 3d9ef2298..3589fc542 100644
--- a/pipelines/jobs/configurations/jdk15u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk15u_pipeline_config.groovy
@@ -131,10 +131,7 @@ class Config15 {
arm32Linux : [
os : 'linux',
arch : 'arm',
- test : [
- nightly: ['sanity.openjdk'],
- weekly : []
- ],
+ test : 'default',
configureArgs : '--enable-dtrace'
],
diff --git a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
index 63281974c..a6ad92b8e 100644
--- a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
@@ -111,10 +111,7 @@ class Config8 {
arm32Linux : [
os : 'linux',
arch: 'arm',
- test: [
- nightly: ['sanity.openjdk'],
- weekly : []
- ]
+ test: 'default'
],
aarch64Linux : [
From 1dc5732a7dab8ad1990a82fa6d0590ca87bb5b72 Mon Sep 17 00:00:00 2001
From: Shelley Lambert <slambert@gmail.com>
Date: Tue, 3 Nov 2020 17:14:39 -0500
Subject: [PATCH 3/4] Reorg of targets for max tests + best machine util
Signed-off-by: Shelley Lambert <slambert@gmail.com>
---
pipelines/build/common/build_base_file.groovy | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy
index 980dafc64..68e0b2156 100644
--- a/pipelines/build/common/build_base_file.groovy
+++ b/pipelines/build/common/build_base_file.groovy
@@ -61,13 +61,15 @@ class Builder implements Serializable {
'sanity.system',
'extended.system',
'sanity.perf',
- 'sanity.external'
+ 'sanity.functional',
+ 'extended.functional'
]
final List<String> weekly = [
'extended.openjdk',
'extended.perf',
- 'special.functional'
+ 'special.functional',
+ 'sanity.external'
]
/*
From 200c424c31a4020497701a7af091fd815185d776 Mon Sep 17 00:00:00 2001
From: Shelley Lambert <slambert@gmail.com>
Date: Wed, 4 Nov 2020 10:30:25 -0500
Subject: [PATCH 4/4] Add comments
Signed-off-by: Shelley Lambert <slambert@gmail.com>
---
pipelines/build/common/build_base_file.groovy | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy
index 68e0b2156..e747d16d4 100644
--- a/pipelines/build/common/build_base_file.groovy
+++ b/pipelines/build/common/build_base_file.groovy
@@ -56,6 +56,10 @@ class Builder implements Serializable {
def context
def currentBuild
+ /*
+ Test targets triggered in 'nightly' build pipelines running 6 days per week
+ nightly + weekly to be run during a 'release' pipeline
+ */
final List<String> nightly = [
'sanity.openjdk',
'sanity.system',
@@ -64,7 +68,10 @@ class Builder implements Serializable {
'sanity.functional',
'extended.functional'
]
-
+ /*
+ Test targets triggered in 'weekly' build pipelines running once per week
+ nightly + weekly to be run during a 'release' pipeline
+ */
final List<String> weekly = [
'extended.openjdk',
'extended.perf',