From 9cac458c67fa4d1581ad6daccfda2510e7120b9b Mon Sep 17 00:00:00 2001
From: Gareth Healy <garethahealy@gmail.com>
Date: Fri, 15 Dec 2023 14:40:52 +0000
Subject: [PATCH] updated outstanding jenkins bases to 4.14 (#676)

---
 _test/kind/setup.sh                            | 18 ++++++++++++++++++
 .../jenkins-agent-ansible/Dockerfile           |  2 +-
 jenkins-agents/jenkins-agent-gradle/Dockerfile |  8 ++++----
 jenkins-agents/jenkins-agent-helm/Dockerfile   |  2 +-
 jenkins-agents/jenkins-agent-ruby/Dockerfile   |  5 ++---
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/_test/kind/setup.sh b/_test/kind/setup.sh
index 18c636ceb..4d182d2c4 100755
--- a/_test/kind/setup.sh
+++ b/_test/kind/setup.sh
@@ -138,12 +138,30 @@ then
   timeout=0
   while [[ $(curl -s http://localhost/job/containers-quickstarts/job/${AGENT}/lastBuild/api/json --user admin:${token} | jq -r '.building') == "true" ]]
   do
+    if [[ ${timeout} -eq 60 ]]
+    then
+      echo "## Things are taking a while... lets check on the logs..."
+      kubectl logs --tail=-1 -l app.kubernetes.io/component=jenkins-controller -n jenkins
+    fi
+
     if [[ ${timeout} -gt 300 ]]
     then
       echo "Timed out waiting for build to finish..."
+      echo "## Build logs"
       get_build_logs
+
+      echo "## Pods"
+      kubectl get pods -n jenkins
+      kubectl get events -n jenkins
+
+      echo "## Controller logs"
+      kubectl logs --tail=-1 -l app.kubernetes.io/component=jenkins-controller -n jenkins
+
+      echo "## Agent logs"
+      kubectl logs --tail=-1 -l jenkins/jenkins-jenkins-agent=true -n jenkins
       exit 1
     fi
+
     sleep 2
     let "timeout += 2"
   done
diff --git a/jenkins-agents/jenkins-agent-ansible/Dockerfile b/jenkins-agents/jenkins-agent-ansible/Dockerfile
index 51b2bcd3d..e657fed6f 100644
--- a/jenkins-agents/jenkins-agent-ansible/Dockerfile
+++ b/jenkins-agents/jenkins-agent-ansible/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14@sha256:1284ffe5b63ee7da4c4463d5f44b471fd42ce01c06f5c72edc195a30dcc1f7f4
 
 # renovate: datasource=pypi depName=ansible-core
 ARG ANSIBLE_CORE_VERSION=2.16.2
diff --git a/jenkins-agents/jenkins-agent-gradle/Dockerfile b/jenkins-agents/jenkins-agent-gradle/Dockerfile
index ab1a0fc9e..520e278b7 100644
--- a/jenkins-agents/jenkins-agent-gradle/Dockerfile
+++ b/jenkins-agents/jenkins-agent-gradle/Dockerfile
@@ -1,6 +1,7 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14@sha256:1284ffe5b63ee7da4c4463d5f44b471fd42ce01c06f5c72edc195a30dcc1f7f4
 
-ENV GRADLE_VERSION=6.3
+# renovate: datasource=github-releases depName=gradle/gradle
+ENV GRADLE_VERSION=8.5
 ENV GRADLE_USER_HOME=/home/jenkins/.gradle
 
 RUN curl -sL -o /tmp/gradle-bin.zip https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip && \
@@ -11,7 +12,6 @@ RUN curl -sL -o /tmp/gradle-bin.zip https://services.gradle.org/distributions/gr
     chown -R 1001:0 /opt/gradle && \
     chmod -R g+rw /opt/gradle && \
     mkdir /home/jenkins/.gradle && \
-    chmod 775 /home/jenkins/.gradle && \
-    alternatives --auto java
+    chmod 775 /home/jenkins/.gradle
 
 USER 1001
diff --git a/jenkins-agents/jenkins-agent-helm/Dockerfile b/jenkins-agents/jenkins-agent-helm/Dockerfile
index e1bee5cf8..ddf29295b 100644
--- a/jenkins-agents/jenkins-agent-helm/Dockerfile
+++ b/jenkins-agents/jenkins-agent-helm/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14@sha256:1284ffe5b63ee7da4c4463d5f44b471fd42ce01c06f5c72edc195a30dcc1f7f4
 
 # renovate: datasource=github-releases depName=helm/helm
 ARG HELM_VERSION=v3.13.2
diff --git a/jenkins-agents/jenkins-agent-ruby/Dockerfile b/jenkins-agents/jenkins-agent-ruby/Dockerfile
index 5e795a2be..5ae16fd1f 100644
--- a/jenkins-agents/jenkins-agent-ruby/Dockerfile
+++ b/jenkins-agents/jenkins-agent-ruby/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14@sha256:1284ffe5b63ee7da4c4463d5f44b471fd42ce01c06f5c72edc195a30dcc1f7f4
 
 ARG RUBY_VERSION=3.1
 # renovate: datasource=repology depName=homebrew/openshift-cli
@@ -49,7 +49,6 @@ RUN curl -sL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_VERS
 COPY ./root/ /
 
 RUN chown -R 1001:0 /opt/app-root && \
-    chmod -R ug+rwx /opt/app-root && \
-    alternatives --auto java
+    chmod -R ug+rwx /opt/app-root
 
 WORKDIR /opt/app-root