modified

Author: akash-manna-sky

.github/renovate.json

@@ -51,6 +51,7 @@
       "customType": "regex",
       "managerFilePatterns": [
         "/src/main/java/org/jenkinsci/test/acceptance/FallbackConfig\\.java/",
+        "/vars.cmd/",
         "/vars.sh/"
       ],
       "matchStrings": [
@@ -102,7 +103,25 @@
       ],
       "depNameTemplate": "{{{repo}}}",
       "datasourceTemplate": "docker"
+    },
+    {
+      "customType": "regex",
+      "managerFilePatterns": [
+        "/pom.xml/"
+      ],
+      "matchStrings": [
+        "<!--RENOVATE-LTS-->\n\\s+<jenkins\\.version>(?<currentValue>.*)<\\/jenkins\\.version>"
+      ],
+      "depNameTemplate": "jenkins-lts-profile",
+      "datasourceTemplate": "custom.jenkins-latest-lts",
+      "versioningTemplate": "semver-coerced"
     }
   ],
+  "customDatasources": {
+    "jenkins-latest-lts": {
+      "defaultRegistryUrlTemplate": "https://updates.jenkins.io/stable/latestCore.txt",
+      "format": "plain"
+    }
+  },
   "rebaseWhen": "conflicted"
 }

.github/workflows/verify-gradle-wrapper.yaml

@@ -6,6 +6,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v5

.mvn/extensions.xml

@@ -2,6 +2,6 @@
     <extension>
         <groupId>io.jenkins.tools.incrementals</groupId>
         <artifactId>git-changelist-maven-extension</artifactId>
-        <version>1.8</version>
+        <version>1.13</version>
     </extension>
 </extensions>

Jenkinsfile.infra.ci.jenkins.io

@@ -5,4 +5,5 @@ buildDockerAndPublishImage('ath', [
   dockerfile: 'src/main/resources/ath-container/Dockerfile',
   imageDir: 'src/main/resources/ath-container/',
   registryNamespace: 'jenkins',
+  cacheTo: 'type=registry,ref=jenkins/ath:build-cache',
 ])

ath-container.sh

@@ -5,15 +5,15 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 
 # Obtain the group ID to grant to access the Docker socket
 if [[ -z ${DOCKER_GID:-} ]]; then
-	DOCKER_GID=$(docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ubuntu:noble stat -c %g /var/run/docker.sock) || exit 1
+	DOCKER_GID=$(docker run --rm -v /var/run/docker.sock:/var/run/docker.sock:Z ubuntu:noble stat -c %g /var/run/docker.sock) || exit 1
 	export DOCKER_GID
 fi
 
 "${DIR}/build-image.sh" || exit 1
 
 trap 'docker-compose kill && docker-compose down' EXIT
 
-docker-compose run --name mvn --rm -P -v "${HOME}/.m2/repository:/home/ath-user/.m2/repository" mvn bash -c 'set-java.sh 17; bash'
+docker-compose run --name mvn --rm -P -v "${HOME}/.m2/repository:/home/ath-user/.m2/repository:Z" mvn bash -c 'set-java.sh 17; bash'
 status=$?
 
 exit $status

build-image.sh

@@ -16,7 +16,7 @@ fi
 
 # Obtain the group ID to grant to access the Docker socket
 if [[ -z ${DOCKER_GID:-} ]]; then
-	DOCKER_GID=$(docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ubuntu:noble stat -c %g /var/run/docker.sock) || exit 1
+	DOCKER_GID=$(docker run --rm -v /var/run/docker.sock:/var/run/docker.sock:Z ubuntu:noble stat -c %g /var/run/docker.sock) || exit 1
 	export DOCKER_GID
 fi
 

ci.sh

@@ -7,13 +7,13 @@ jenkinsVersion="$3"
 
 # Obtain the group ID to grant to access the Docker socket
 if [[ -z ${DOCKER_GID:-} ]]; then
-	DOCKER_GID=$(docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ubuntu:noble stat -c %g /var/run/docker.sock) || exit 1
+	DOCKER_GID=$(docker run --rm -v /var/run/docker.sock:/var/run/docker.sock:Z ubuntu:noble stat -c %g /var/run/docker.sock) || exit 1
 	export DOCKER_GID
 fi
 
 trap 'docker-compose kill && docker-compose down' EXIT
 
-docker-compose run -e "MAVEN_ARGS=${MAVEN_ARGS}" --name mvn -T --rm -v "${MAVEN_SETTINGS}:${MAVEN_SETTINGS}" mvn bash -s <<-INSIDE
+docker-compose run -e "MAVEN_ARGS=${MAVEN_ARGS}" --name mvn -T --rm -v "${MAVEN_SETTINGS}:${MAVEN_SETTINGS}:Z" mvn bash -s <<-INSIDE
 	set-java.sh ${jdk}
 
 	# Ensure that Jenkins node setup does not influence the container Java setup

docker-compose.yml

@@ -1,66 +1,68 @@
 ---
 services:
   init_video:
+    container_name: init_video
     image: ubuntu:noble
     command: >
-      sh -c "mkdir -p /tmp/videos && chmod 0777 /tmp/videos"
+      sh -c 'chown 1000:1000 /videos && chmod 0777 /videos'
+    user: root
     volumes:
-      - shared_tmp:/tmp
-  firefox:
-    container_name: firefox
+      - videos:/videos:z
+  browser:
+    container_name: browser
     environment:
       - SE_JAVA_OPTS=-Xmx256m -XX:+HeapDumpOnOutOfMemoryError -XX:+TieredCompilation -XX:TieredStopAtLevel=1
-      - SE_NODE_GRID_URL=http://firefox:4444  # Selenium needs to know where to advertise itself (e.g. BiDi)
+      - SE_NODE_GRID_URL=http://browser:4444  # Selenium needs to know where to advertise itself (e.g. BiDi)
       - SE_SCREEN_HEIGHT=1090
       - SE_SCREEN_WIDTH=1680
     extra_hosts:
       - host.docker.internal:host-gateway
-    image: selenium/standalone-firefox:4.32.0@sha256:40c0aa58b61f51aadda3dc0f92f7b8fa02658bb1cf8a9293b8cd7e5c7913d506
+    image: selenium/standalone-firefox:4.36.0@sha256:f25c31de560ebf215dc646d0d09f9d78b4eba3e5a43b9e1f41231a9256e4bf25
     networks:
       - ath-network
     ports:
       - 4444:4444  # Selenium Grid port
       - 5900:5900  # VNC port
     shm_size: 2g
     volumes:
-      - shared_tmp:/tmp
+      - videos:/videos:z
   video:
     container_name: video
     depends_on:
-      - firefox
+      - browser
       - init_video
     environment:
-      - DISPLAY_CONTAINER_NAME=firefox
-      - SE_NODE_GRID_URL=http://firefox:4444
+      - DISPLAY_CONTAINER_NAME=browser
+      - SE_NODE_GRID_URL=http://browser:4444
       - SE_NODE_PORT=4444
       - SE_VIDEO_FILE_NAME=auto
       - SE_VIDEO_FILE_NAME_SUFFIX=false
       - SE_VIDEO_RECORD_STANDALONE=true
-      - VIDEO_FOLDER=/tmp2/videos
+      - VIDEO_FOLDER=/videos
     image: selenium/video:ffmpeg-7.1-20250515@sha256:5e283b26b1bb14cabb03b31aaf7d88348e93e92d82b0e1704780611bef129964
     networks:
       - ath-network
     volumes:
-      - shared_tmp:/tmp2  # Avoid conflict with supervisord
+      - videos:/videos:z
   mvn:
     build:
       context: src/main/resources/ath-container
       dockerfile: Dockerfile
       cache_from:
-        - jenkins/ath:latest
+        - type=registry,ref=jenkins/ath:build-cache
     container_name: mvn
     depends_on:
-      - firefox
+      - browser
       - video
     environment:
-      - DISPLAY=firefox:99.0
+      - DISPLAY=browser:99.0
       - DOCKER_FIXTURES_NETWORK=ath-network
       - JENKINS_LOCAL_HOSTNAME=mvn
-      - REMOTE_WEBDRIVER_URL=http://firefox:4444/wd/hub
+      - REMOTE_WEBDRIVER_URL=http://browser:4444/wd/hub
       - SELENIUM_PROXY_HOSTNAME=mvn
       - SHARED_DOCKER_SERVICE=true
       - TESTCONTAINERS_HOST_OVERRIDE=host.docker.internal
-      - VIDEO_FOLDER=/tmp/videos
+      - VIDEO_FOLDER=/videos
     extra_hosts:
       - host.docker.internal:host-gateway
     group_add:
@@ -73,16 +75,16 @@ services:
     shm_size: 2g
     user: ath-user
     volumes:
-      - ${PWD}:/home/ath-user/sources
-      - shared_tmp:/tmp
-      - /var/run/docker.sock:/var/run/docker.sock
+      - ${PWD}:/home/ath-user/sources:Z
+      - videos:/videos:z
+      - /var/run/docker.sock:/var/run/docker.sock:Z
     working_dir: /home/ath-user/sources
 networks:
   ath-network:
     name: ath-network
     attachable: true
 volumes:
-  shared_tmp:
+  videos:
     driver: local
     driver_opts:
       type: tmpfs

dockerinject.groovy

@@ -30,7 +30,7 @@ For example, to run tests with Safari, you'd execute:
     # or more concisely
     BROWSER=safari mvn install
 
-See `FallbackConfig.java` for how the browser is selected.
+See `Config.java` for how the browser is selected.
 
 Please note selenium library is sensitive to versions of browser used so it is better to stick with recent stable versions of mainstream web browsers. For more information about Selenium supported platforms visit [this page](http://www.seleniumhq.org/about/platforms.jsp).