From 530260304cce1f7768934de0416ea767e789e6ce Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Fri, 11 Nov 2022 15:03:11 +0100 Subject: [PATCH 1/9] SLING-11671 - Jenkins: allow running Sling Starter ITs with a given module based on the Sling module descriptor Run Sling Starter ITs with the build and pick up the Jenkinsfile from a branch --- .sling-module.json | 9 +++++++++ Jenkinsfile | 1 + 2 files changed, 10 insertions(+) create mode 100644 .sling-module.json diff --git a/.sling-module.json b/.sling-module.json new file mode 100644 index 000000000..468185341 --- /dev/null +++ b/.sling-module.json @@ -0,0 +1,9 @@ +{ + "jenkins": { + "starterITExecutions": { + "13-SNAPSHOT": { + "jdks:" [8, 11] + } + } + } +} diff --git a/Jenkinsfile b/Jenkinsfile index f5825190c..ce042b5de 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,5 @@ * under the License. */ +@Library('sling@feature/SLING-11671') slingOsgiBundleBuild() From e7c1ff6800fdd7115261010fbe865a82979b09b2 Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Fri, 11 Nov 2022 15:18:08 +0100 Subject: [PATCH 2/9] SLING-11671 - Jenkins: allow running Sling Starter ITs with a given module based on the Sling module descriptor Fix library import for Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ce042b5de..6f0756314 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,5 +17,5 @@ * under the License. */ -@Library('sling@feature/SLING-11671') +@Library('sling@feature/SLING-11671') _ slingOsgiBundleBuild() From 6475f5f8f71392b7c28f7d2c196e8a5c87ddf845 Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Fri, 11 Nov 2022 15:28:00 +0100 Subject: [PATCH 3/9] SLING-11671 - Jenkins: allow running Sling Starter ITs with a given module based on the Sling module descriptor Force rebuild --- .sling-module.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sling-module.json b/.sling-module.json index 468185341..e285e5698 100644 --- a/.sling-module.json +++ b/.sling-module.json @@ -2,7 +2,7 @@ "jenkins": { "starterITExecutions": { "13-SNAPSHOT": { - "jdks:" [8, 11] + "jdks:" [8, 11] } } } From 4439e1a26182eee49c24e5927ea677f8f49d3ae2 Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Fri, 11 Nov 2022 15:29:14 +0100 Subject: [PATCH 4/9] SLING-11671 - Jenkins: allow running Sling Starter ITs with a given module based on the Sling module descriptor Fix syntax in module descriptor --- .sling-module.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sling-module.json b/.sling-module.json index e285e5698..0766578e3 100644 --- a/.sling-module.json +++ b/.sling-module.json @@ -2,7 +2,7 @@ "jenkins": { "starterITExecutions": { "13-SNAPSHOT": { - "jdks:" [8, 11] + "jdks": [8, 11] } } } From b875650c9a7dfaf310250a5daf70c2236782a487 Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Fri, 11 Nov 2022 15:38:49 +0100 Subject: [PATCH 5/9] SLING-11671 - Jenkins: allow running Sling Starter ITs with a given module based on the Sling module descriptor Trigger rebuild --- .sling-module.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sling-module.json b/.sling-module.json index 0766578e3..a568420d2 100644 --- a/.sling-module.json +++ b/.sling-module.json @@ -2,7 +2,7 @@ "jenkins": { "starterITExecutions": { "13-SNAPSHOT": { - "jdks": [8, 11] + "jdks": [8, 11] } } } From 29d74fc07f8a697bf4a5815019e5e1050cb07a7f Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Fri, 11 Nov 2022 15:41:08 +0100 Subject: [PATCH 6/9] SLING-11671 - Jenkins: allow running Sling Starter ITs with a given module based on the Sling module descriptor Speed up main build by not running tests --- .sling-module.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.sling-module.json b/.sling-module.json index a568420d2..a8c318c93 100644 --- a/.sling-module.json +++ b/.sling-module.json @@ -4,6 +4,7 @@ "13-SNAPSHOT": { "jdks": [8, 11] } - } + }, + "additionalMavenParams": "-DskipTests -DskipITs" } } From b1253b6014a2ec7126b19b8df9938329b63c7ba4 Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Fri, 11 Nov 2022 15:45:59 +0100 Subject: [PATCH 7/9] SLING-11671 - Jenkins: allow running Sling Starter ITs with a given module based on the Sling module descriptor Speed up main build by disabling SonarQube analysis. --- .sling-module.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.sling-module.json b/.sling-module.json index a8c318c93..12f8004b4 100644 --- a/.sling-module.json +++ b/.sling-module.json @@ -5,6 +5,7 @@ "jdks": [8, 11] } }, - "additionalMavenParams": "-DskipTests -DskipITs" + "additionalMavenParams": "-DskipTests -DskipITs", + "sonarQubeEnabled": false } } From 6603752f7fcde910a4291b784f28ee856a98d0cb Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Fri, 11 Nov 2022 15:59:18 +0100 Subject: [PATCH 8/9] SLING-11671 - Jenkins: allow running Sling Starter ITs with a given module based on the Sling module descriptor Trigger rebuild --- .sling-module.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sling-module.json b/.sling-module.json index 12f8004b4..9a9499e01 100644 --- a/.sling-module.json +++ b/.sling-module.json @@ -2,7 +2,7 @@ "jenkins": { "starterITExecutions": { "13-SNAPSHOT": { - "jdks": [8, 11] + "jdks": [8, 11] } }, "additionalMavenParams": "-DskipTests -DskipITs", From 951fc5f0e457e0522f12600e839647f308beaf5d Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Fri, 11 Nov 2022 17:32:17 +0100 Subject: [PATCH 9/9] SLING-11671 - Jenkins: allow running Sling Starter ITs with a given module based on the Sling module descriptor Build with Java 17 as well, to ensure parallel executions don't interfere with each other --- .sling-module.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sling-module.json b/.sling-module.json index 9a9499e01..cd545f9d9 100644 --- a/.sling-module.json +++ b/.sling-module.json @@ -2,7 +2,7 @@ "jenkins": { "starterITExecutions": { "13-SNAPSHOT": { - "jdks": [8, 11] + "jdks": [8, 11, 17] } }, "additionalMavenParams": "-DskipTests -DskipITs",