Revert "Upgrade carthago to 0.18.0 and jenkins to 2.361.1-lts"

This reverts commit 9ee3906.
VirtusLab · Sep 21, 2022 · 0c290fa · 0c290fa
1 parent 55a0b0e
commit 0c290fa
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 19 deletions.
diff --git a/k8s/jenkins-operator.yaml b/k8s/jenkins-operator.yaml
@@ -9,7 +9,7 @@ operator:
   replicaCount: 1
 
   # image is the name (and tag) of the Carthago Operator for Jenkins image
-  image: carthago.azurecr.io/carthago-op-jenkins:0.18.0
+  image: carthago.azurecr.io/carthago-op-jenkins:0.17.0
 
   # imagePullPolicy defines policy for pulling images
   imagePullPolicy: IfNotPresent

diff --git a/k8s/jenkins.yaml b/k8s/jenkins.yaml
@@ -30,7 +30,7 @@ jenkins:
     sidecars: []
     jenkinsController:
       name: jenkins-controller
-      image: jenkins/jenkins:2.361.1-lts
+      image: jenkins/jenkins:2.332.3-lts
       imagePullPolicy: IfNotPresent
       command: []
       livenessProbe: {}
@@ -126,28 +126,62 @@ jenkins:
   # - name: jacoco
   #   version: "3.1.1"
   plugins:
-    - name: ansicolor
-      version: "1.0.2"
     - name: blueocean
-      version: "1.25.8"
+      version: "1.25.5"
+    - name: timestamper
+      version: "1.18"
+    - name: ansicolor
+      version: "1.0.1"
+    - name: parameter-separator
+      version: "1.3"
     - name: copyartifact
-      version: "1.47"
-    - name: git
-      version: "4.11.5"
-    - name: git-client
-      version: "3.11.2"
-    - name: github
-      version: "1.35.0"
+      version: "1.46.4"
     - name: github-oauth
       version: "0.39"
-    - name: kubernetes
-      version: "3704.va_08f0206b_95e"
     - name: matrix-auth
-      version: "3.1.5"
-    - name: parameter-separator
-      version: "1.3"
-    - name: timestamper
-      version: "1.20"
+      version: "3.1.3"
+    - name: git-client
+      version: "3.11.0"
+    - name: github
+      version: "1.34.3"
+    - name: git
+      version: "4.11.3"
+    - name: kubernetes
+      version: "3651.v908e7db_10d06"
+    - name: kubernetes-client-api
+      version: "5.12.2-193.v26a_6078f65a_9"
+    - name: workflow-api
+      version: "1164.v760c223ddb_32"
+    - name: workflow-aggregator
+      version: "581.v0c46fa_697ffd"
+    - name: workflow-cps
+      version: "2725.v7b_c717eb_12ce"
+    - name: workflow-job
+      version: "1189.va_d37a_e9e4eda_"
+    - name: workflow-durable-task-step
+      version: "1155.v79567b_e0a_2de"
+    - name: workflow-basic-steps
+      version: "948.v2c72a_091b_b_68"
+    - name: workflow-support
+      version: "820.vd1a_6cc65ef33"
+    - name: pipeline-model-definition
+      version: "2.2097.v33db_b_de764b_e"
+    - name: pipeline-model-api
+      version: "2.2097.v33db_b_de764b_e"
+    - name: pipeline-stage-tags-metadata
+      version: "2.2097.v33db_b_de764b_e"
+    - name: pipeline-model-extensions
+      version: "2.2097.v33db_b_de764b_e"
+    - name: job-dsl
+      version: "1.79"
+    - name: junit
+      version: "1119.1121.vc43d0fc45561"
+    - name: script-security
+      version: "1175.v4b_d517d6db_f0"
+    - name: display-url-api
+      version: "2.3.6"
+    - name: parameterized-scheduler
+      version: "1.1"
 
   # roles define a list of extra RBAC roles for the Jenkins Master pod service account
   roles: []