Chore/update jenkins version (#2585)

* Update jenkins controller version * Use LTS version * remove selenium container from jenkins controller
uc-cdis · Jul 8, 2024 · d387d57 · d387d57
1 parent 83d38c2
commit d387d57
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 33 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -1506,14 +1506,14 @@
         "filename": "kube/services/jenkins/jenkins-deploy.yaml",
         "hashed_secret": "c937b6fbb346a51ef679dd02ac5c4863e02bfdbf",
         "is_verified": false,
-        "line_number": 157
+        "line_number": 144
       },
       {
         "type": "Secret Keyword",
         "filename": "kube/services/jenkins/jenkins-deploy.yaml",
         "hashed_secret": "9ce05cf6168d15dfe02aac9ca9e0712c19c9436d",
         "is_verified": false,
-        "line_number": 160
+        "line_number": 147
       }
     ],
     "kube/services/jenkins2-ci-worker/jenkins2-ci-worker-deploy.yaml": [
@@ -1554,14 +1554,14 @@
         "filename": "kube/services/jenkins2/jenkins2-deploy.yaml",
         "hashed_secret": "c937b6fbb346a51ef679dd02ac5c4863e02bfdbf",
         "is_verified": false,
-        "line_number": 153
+        "line_number": 140
       },
       {
         "type": "Secret Keyword",
         "filename": "kube/services/jenkins2/jenkins2-deploy.yaml",
         "hashed_secret": "9ce05cf6168d15dfe02aac9ca9e0712c19c9436d",
         "is_verified": false,
-        "line_number": 156
+        "line_number": 143
       }
     ],
     "kube/services/jobs/arborist-rm-expired-access-cronjob.yaml": [
@@ -3737,5 +3737,5 @@
       }
     ]
   },
-  "generated_at": "2024-03-07T21:26:14Z"
+  "generated_at": "2024-07-05T21:37:59Z"
 }
diff --git a/Docker/jenkins/Jenkins/Dockerfile b/Docker/jenkins/Jenkins/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/jenkins:2.426.3-lts-jdk21
+FROM jenkins/jenkins:2.452.2-lts-jdk21
 
 USER root
 

diff --git a/Docker/jenkins/Jenkins2/Dockerfile b/Docker/jenkins/Jenkins2/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/jenkins:2.426.3-lts-jdk21
+FROM jenkins/jenkins:2.452.2-lts-jdk21
 
 USER root
 

diff --git a/kube/services/jenkins/jenkins-deploy.yaml b/kube/services/jenkins/jenkins-deploy.yaml
@@ -135,19 +135,6 @@ spec:
           subPath: "ca.pem"
         - name: dockersock
           mountPath: "/var/run/docker.sock"
-      - name: selenium
-        image: selenium/standalone-chrome:3.14
-        ports:
-        - containerPort: 4444
-        readinessProbe:
-          httpGet:
-            path: /wd/hub/sessions
-            port: 4444
-        readinessProbe:
-          httpGet:
-            path: /wd/hub/sessions
-            port: 4444
-        imagePullPolicy: Always
       volumes:
       - name: datadir
         persistentVolumeClaim:

diff --git a/kube/services/jenkins2/jenkins2-deploy.yaml b/kube/services/jenkins2/jenkins2-deploy.yaml
@@ -131,19 +131,6 @@ spec:
           subPath: "ca.pem"
         - name: dockersock
           mountPath: "/var/run/docker.sock"
-      - name: selenium
-        image: selenium/standalone-chrome:3.14
-        ports:
-        - containerPort: 4444
-        readinessProbe:
-          httpGet:
-            path: /wd/hub/sessions
-            port: 4444
-        readinessProbe:
-          httpGet:
-            path: /wd/hub/sessions
-            port: 4444
-        imagePullPolicy: Always
       volumes:
       - name: datadir
         persistentVolumeClaim: