From 0e6a548f4965af23247a6491b22da0d56e76c85f Mon Sep 17 00:00:00 2001 From: Michael Armijo Date: Tue, 29 Aug 2023 10:50:32 -0400 Subject: [PATCH 1/2] jenkins/plugins: remove plugin fast-tracks The versions of the kubernetes and token-macro plugins have been updated to more recent versions in openshift/jenkins. Remove the fast-tracks for these plugins to pick up the updated versions. --- jenkins/controller/plugins.txt | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/jenkins/controller/plugins.txt b/jenkins/controller/plugins.txt index fb2de0ed1..404512fd8 100644 --- a/jenkins/controller/plugins.txt +++ b/jenkins/controller/plugins.txt @@ -34,16 +34,3 @@ splunk-devops:1.9.9 # The below list are plugins that are also in base-plugins.txt but for # some reason or other we need to temporarily freeze or fast-track. # -# NOTE: 20221004 had to fast-track token-macro to 293.v283932a_0a_b_49 -# because the old version was preventing another plugin from starting. I -# imagine this most recent change upstream [1] hasn't landed in an OpenShift -# release yet. -# [1] https://github.com/openshift/jenkins/commit/17001022a47849b5b6abb255bfcc64b87e4ad7a2 -# -# NOTE: 20221004 had to fast-track kubernetes plugin (from bundle-plugins.txt) -# to 1.31.2 because of https://issues.jenkins.io/browse/JENKINS-67483. 1.31.2 is -# still 6+ months out of date. jlebon filed https://github.com/openshift/jenkins/issues/1493 -# to try to get the team to use a newer version. -# -token-macro:293.v283932a_0a_b_49 -kubernetes:1.31.2 From 6add74f5da2a87acf64aaba8911957fd1af0c869 Mon Sep 17 00:00:00 2001 From: Michael Armijo Date: Tue, 29 Aug 2023 11:24:23 -0400 Subject: [PATCH 2/2] jenkins/plugins: add antisamy-markup-formatter This plugin is listed as a dependency of the timestamper plugin. The Jenkins instance fails to load without it. --- jenkins/controller/plugins.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins/controller/plugins.txt b/jenkins/controller/plugins.txt index 404512fd8..7804a5109 100644 --- a/jenkins/controller/plugins.txt +++ b/jenkins/controller/plugins.txt @@ -30,6 +30,7 @@ slack:625.va_eeb_b_168ffb_0 timestamper:1.20 splunk-devops-extend:1.9.9 splunk-devops:1.9.9 +antisamy-markup-formatter:162.v0e6ec0fcfcf6 # The below list are plugins that are also in base-plugins.txt but for # some reason or other we need to temporarily freeze or fast-track.