From a1ed51979058390e8f9e5e35ff62be5c9a1170ae Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Mon, 4 Sep 2023 20:37:03 -0600 Subject: [PATCH 1/3] Pin snakeyaml-api 1.33 for Jenkins 2.387.3 This pinning of the plugin version is being done to pass the 2.387.3 tests for the blue ocean plugin and the kubernetes plugin. I think that is better than excluding the failing tests, since the failing tests would be excluded on all versions, not just one version. This is atypical, since the snakeyaml 2.2 plugin supports Jenkins 2.387.3, but other plugins that run on 2.387.3 do not support snakeyaml 2.2. The blue ocean plugin version 1.27.5.1 (most recent release supported with Jenkins 2.387.3) does not support snakeyaml plugin 2.2 based on https://issues.jenkins.io/browse/JENKINS-71966 The kubernetes plugin version 4007.v633279962016 (most recent release supported with Jenkins 2.387.3) does not seem to support snakeyaml plugin 2.2 based on the test results from https://github.com/jenkinsci/bom/pull/2464/checks?check_run_id=16489432297 --- bom-2.387.x/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bom-2.387.x/pom.xml b/bom-2.387.x/pom.xml index 1579ffeb5..e3bc1fefc 100644 --- a/bom-2.387.x/pom.xml +++ b/bom-2.387.x/pom.xml @@ -131,6 +131,11 @@ kubernetes-credentials 0.10.0 + + io.jenkins.plugins + snakeyaml-api + 1.33-95.va_b_a_e3e47b_fa_4 + From 8b98d3740f33d293f5b71b6b7a04b6effd83da22 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Mon, 4 Sep 2023 21:09:01 -0600 Subject: [PATCH 2/3] Format the pom --- bom-2.387.x/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bom-2.387.x/pom.xml b/bom-2.387.x/pom.xml index e3bc1fefc..2020d150b 100644 --- a/bom-2.387.x/pom.xml +++ b/bom-2.387.x/pom.xml @@ -116,6 +116,11 @@ jenkins-design-language ${blueocean-plugin.version} + + io.jenkins.plugins + snakeyaml-api + 1.33-95.va_b_a_e3e47b_fa_4 + org.csanchez.jenkins.plugins kubernetes @@ -131,11 +136,6 @@ kubernetes-credentials 0.10.0 - - io.jenkins.plugins - snakeyaml-api - 1.33-95.va_b_a_e3e47b_fa_4 - From 5afad6644531ada48bafdd30a9d0541e4942285b Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Mon, 4 Sep 2023 21:16:24 -0600 Subject: [PATCH 3/3] Pin configuration as code 1670 for Jenkins 2.387.3 Avoiding snakeyaml api plugin 2.2 --- bom-2.387.x/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bom-2.387.x/pom.xml b/bom-2.387.x/pom.xml index 2020d150b..18425324e 100644 --- a/bom-2.387.x/pom.xml +++ b/bom-2.387.x/pom.xml @@ -10,6 +10,7 @@ pom 1.27.5.1 + 1670.v564dc8b_982d0 @@ -20,6 +21,11 @@ pom import + + io.jenkins + configuration-as-code + ${configuration-as-code-plugin.version} + io.jenkins.blueocean blueocean-bitbucket-pipeline @@ -116,6 +122,11 @@ jenkins-design-language ${blueocean-plugin.version} + + io.jenkins.configuration-as-code + test-harness + ${configuration-as-code-plugin.version} + io.jenkins.plugins snakeyaml-api