migrate Jenkins images and configurations from UBI8 to UBI9

Author: BraisVQ

.github/workflows/continuous-integration-workflow.yml

@@ -14,12 +14,16 @@ jobs:
         name: Checkout repository
         uses: actions/checkout@v4.2.2
       -
-        name: Build UBI8 docker image
+        name: Login to Red Hat Registry
+        run: |
+          docker login -u ${{ secrets.REDHAT_REGISTRY_USERNAME }} -p ${{ secrets.REDHAT_REGISTRY_PASSWORD }} registry.redhat.io
+      -
+        name: Build UBI9 docker image
         run: |
           ./.github/workflows/build-docker-image.sh \
-          --imagename ods-jenkins-master-ubi8 \
+          --imagename ods-jenkins-master-ubi9 \
           --dockerdir jenkins/master \
-          --dockerfile Dockerfile.ubi8
+          --dockerfile Dockerfile.ubi9
 
   jenkins-agent-base:
     name: Jenkins agent base tests
@@ -28,24 +32,18 @@ jobs:
       -
         name: Checkout repository
         uses: actions/checkout@v4.2.2
-      - name: Build UBI8 docker image
+      -
+        name: Login to Red Hat Registry
+        run: |
+          docker login -u ${{ secrets.REDHAT_REGISTRY_USERNAME }} -p ${{ secrets.REDHAT_REGISTRY_PASSWORD }} registry.redhat.io
+      - name: Build UBI9 docker image
         run: |
           ./.github/workflows/build-docker-image.sh \
-          --imagename ods-jenkins-agent-base-ubi8 \
+          --imagename ods-jenkins-agent-base-ubi9 \
           --dockerdir jenkins/agent-base \
-          --dockerfile Dockerfile.ubi8 \
+          --dockerfile Dockerfile.ubi9 \
           --build-arg SNYK_DISTRIBUTION_URL="https://github.com/snyk/snyk/releases/download/v1.1097.0/snyk-linux"
-      - name: Push UBI8 docker image
-        if: success() && github.repository == 'opendevstack/ods-core' && github.event_name == 'push'
-        shell: bash
-        env:
-          DOCKER_USER: ${{ secrets.DockerHubUser }}
-          DOCKER_PASS: ${{ secrets.DockerHubPass }}
-        run: |
-          ./.github/workflows/push-docker-image.sh \
-          --user "$DOCKER_USER" \
-          --password "$DOCKER_PASS" \
-          --imagename ods-jenkins-agent-base-ubi8
+
   sonarqube:
     name: SonarQube tests
     runs-on: ubuntu-22.04

configuration-sample/ods-core.env.sample

@@ -275,29 +275,25 @@ CONFLUENCE_URL=http://192.168.56.31:8090
 ###########
 
 # Base image for Jenkins master.
-# For UBI8-based images (OpenShift 4):
+# For ubi9-based images (OpenShift 4):
 # - RHEL variant: https://catalog.redhat.com/en/software/containers/ocp-tools-4/jenkins-rhel9/65dc9063b7db2e8b83a5b299
 # -      Example: registry.redhat.io/ocp-tools-4/jenkins-rhel9:v4.19.0
 # -      Last tested: registry.redhat.io/ocp-tools-4/jenkins-rhel9:v4.19.0-1758208739
-# - Community variant: https://quay.io/repository/openshift/origin-jenkins?tab=tags
-# -           Example: quay.io/openshift/origin-jenkins:4.6
 JENKINS_MASTER_BASE_FROM_IMAGE=registry.redhat.io/ocp-tools-4/jenkins-rhel9:v4.19.0-1758208739
 
 # Dockerfile to use for Jenkins master.
-# Use "Dockerfile.ubi9" for OpenShift 4  (UBI9 base image)
+# Use "Dockerfile.ubi9" for OpenShift 4  (ubi9 base image)
 JENKINS_MASTER_DOCKERFILE_PATH=Dockerfile.ubi9
 
 # Base image for Jenkins agent base.
-# For UBI8-based images (OpenShift 4):
+# For ubi9-based images (OpenShift 4):
 # - RHEL variant: https://catalog.redhat.com/en/software/containers/ocp-tools-4/jenkins-agent-base-rhel9/65dc9063b7db2e8b83a5b29e
 # -      Example: registry.redhat.io/ocp-tools-4/jenkins-agent-base-rhel9:v4.19.0
 # -      Last tested: registry.redhat.io/ocp-tools-4/jenkins-agent-base-rhel9:v4.19.0-1758206850
-# - Community variant: https://quay.io/repository/openshift/origin-jenkins-agent-base?tab=tags
-# -           Example: quay.io/openshift/origin-jenkins-agent-base:4.6
 JENKINS_AGENT_BASE_FROM_IMAGE=registry.redhat.io/ocp-tools-4/jenkins-agent-base-rhel9:v4.19.0-1758206850
 
 # Dockerfile to use for Jenkins agents.
-# Use "Dockerfile.ubi9" for OpenShift 4  (UBI9 base image)
+# Use "Dockerfile.ubi9" for OpenShift 4  (ubi9 base image)
 JENKINS_AGENT_DOCKERFILE_PATH=Dockerfile.ubi9
 
 # Snyk CLI binary distribution url

jenkins/agent-base/Dockerfile.ubi8

@@ -1,4 +1,4 @@
-FROM quay.io/openshift/origin-jenkins-agent-base
+FROM registry.redhat.io/ocp-tools-4/jenkins-agent-base-rhel9:v4.19.0-1758206850
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

jenkins/agent-base/Dockerfile.ubi9

@@ -1,4 +1,4 @@
-FROM quay.io/openshift/origin-jenkins
+FROM registry.redhat.io/ocp-tools-4/jenkins-rhel9:v4.19.0-1758208739
 
 ENV JAVA_HOME /usr/lib/jvm/jre-21