Merge branch 'master' into dockerstatic_cs10

Author: sxa

.github/ISSUE_TEMPLATE/machineaccess.md

@@ -3,13 +3,15 @@ name: ⌨️  Request access to a machine
 about: Request access to an AdoptOpenJDK machine or set of machines
 title: Access request for <your username>
 labels: 'Temp Infra Access'
-assignees: 'sxa'
 
 ---
 **NOTE: THIS ISSUE SHOULD NOT BE CLOSED BY THE ORIGINATOR IF ACCESS IS GRANTED**.
+
 When the access is no longer needed please add a comment and a member
 of the infrastructure team will revoke it and close the issue.
 
+NOTE 2: For the infra team member picking this up, the process is described [here](https://github.com/adoptium/infrastructure/blob/master/FAQ.md#temporary-access-to-a-machine)
+
 Required access level (Delete as appropriate). Note that you should only
 request the minimum level that is required to solve your problem
 
@@ -21,3 +23,4 @@ request the minimum level that is required to solve your problem
 System for which access is needed:
 
 Please explain why you need this access including whether it is a temporary or permanent request:
+

.github/workflows/build.yml

@@ -28,18 +28,18 @@ jobs:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: Set up Docker Buildx to use cache feature
-      uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
+      uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
 
     - name: Login to Docker Hub
-      uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+      uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_TOKEN }}
       if: github.ref == 'refs/heads/master'
 
 
     - name: Docker Build CentOS6 Image Test
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+      uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
       with:
         file: ./ansible/docker/Dockerfile.CentOS6
         build-args: git_sha=${{ github.sha }}
@@ -50,7 +50,7 @@ jobs:
       if: github.ref != 'refs/heads/master'
 
     - name: Docker Build & Push Centos6 Image to Docker Hub On Merge
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+      uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
       with:
         file: ./ansible/docker/Dockerfile.CentOS6
         build-args: git_sha=${{ github.sha }}
@@ -68,10 +68,10 @@ jobs:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: Set up Docker Buildx to use cache feature
-      uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
+      uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
 
     - name: Docker Build Alpine3 Image
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+      uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
       with:
         file: ./ansible/docker/Dockerfile.Alpine3
         build-args: git_sha=${{ github.sha }}

.github/workflows/build_qemu.yml

@@ -39,7 +39,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Run on architecture
-        uses: uraimo/run-on-arch-action@5397f9e30a9b62422f302092631c99ae1effcd9e # v2.8.1
+        uses: uraimo/run-on-arch-action@d94c13912ea685de38fccc1109385b83fd79427d # v3.0.1
         with:
           arch: ${{ matrix.arch }}
           distro: ${{ matrix.distro }}

.github/workflows/build_vagrant.yml

@@ -60,7 +60,7 @@ jobs:
 
     - name: Cache Solaris10.box
       id: solaris-10-cache
-      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
         path: Solaris10.box
         key: sol10boxcache

.github/workflows/build_wsl.yml

@@ -36,7 +36,7 @@ jobs:
         New-NetFirewallRule -DisplayName "ALLOW TCP PORT 5986" -Direction inbound -Profile Any -Action Allow -LocalPort 5986 -Protocol TCP
         Invoke-WebRequest https://raw.githubusercontent.com/ansible/ansible-documentation/devel/examples/scripts/ConfigureRemotingForAnsible.ps1 -OutFile .\ConfigureRemotingForAnsible.ps1
         $expectedChecksum = "EBA72DF06E3E77709595F75D1D5B4D95B06602429DD2A3F7867406DF875B0C70"
-        $actualChecksum = Get-FileHash -Path ".\ConfigureRemotingForAnsible.ps1" -Algorithm SHA256 | Select-Object -ExpandProperty Hash        
+        $actualChecksum = Get-FileHash -Path ".\ConfigureRemotingForAnsible.ps1" -Algorithm SHA256 | Select-Object -ExpandProperty Hash
         if ($actualChecksum -ne $expectedChecksum) {
             Write-Output "Checksum mismatch"
             Write-Output "Actual Checksum: $actualChecksum"
@@ -46,12 +46,14 @@ jobs:
             .\ConfigureRemotingForAnsible.ps1 -CertValidityDays 9999
             .\ConfigureRemotingForAnsible.ps1 -EnableCredSSP
             .\ConfigureRemotingForAnsible.ps1 -ForceNewSSLCert
-            .\ConfigureRemotingForAnsible.ps1 -SkipNetworkProfileCheck       
+            .\ConfigureRemotingForAnsible.ps1 -SkipNetworkProfileCheck
         }
 
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-    - uses: Vampire/setup-wsl@23f94bc31caaddc08bd1230a00b89f872633d8d7 # v3.1.3
+    - uses: Vampire/setup-wsl@f40fb59d850112c9a292b0218bca8271305b9127 # v5.0.0
+      with:
+        wsl-version: 1
 
     - name: Install dependencies
       run: |

.github/workflows/linter.yml

@@ -28,7 +28,7 @@ jobs:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: 'Yamllint'
-      uses: karancode/yamllint-github-action@fdef6bc189425ecc84cc4543b2674566c0827053 # v2.1.1
+      uses: karancode/yamllint-github-action@4052d365f09b8d34eb552c363d1141fd60e2aeb2 # v3.0.0
       with:
         yamllint_comment: true
       env:
@@ -42,7 +42,7 @@ jobs:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: Set up Python 3.x
-      uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
+      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
       with:
         python-version: '3.x'
 

FAQ.md

@@ -244,7 +244,23 @@ things regarding the information in this table:
 (For the last one, that makes use of the system.custom target added via
 [this PR](https://github.com/AdoptOpenJDK/openjdk-tests/pull/2234))
 
-## Running The SSL Test Suites
+### Notes for the Smoke Tests
+
+The smoke tests (which run after the build, but *before* the main AQA jobs)
+need some special configuration and deviate from what is listed above
+because they come from a non-default repository (temurin-build).  To run
+those you will need to run `extended.functional` but including the the
+following parameters to `get.sh`:
+
+```
+./get.sh --vendor_repos https://github.com/adoptium/temurin-build \
+         --vendor_branches master --vendor_dirs /test/functional
+cd TKG
+make compile
+make _extended.functional
+```
+
+### Running The SSL Test Suites
 <details>
 <summary>Quick Guide To Running The SSL Test Suites</summary>
 

README.md

@@ -113,6 +113,8 @@ to do an out-of-bound patch if a sufficientl sever issue is identified.
 1. Ensure off-machine backups are working!
 1. Ensure that no non-pipeline jobs are running on the server as they
    will often hold up restarts
+1. Create a tarball backup of the main config.xml and plugins.xml so they
+   can be quickly restored in the event of upgrade problems: `tar czf /home/jenkins/jenkinsbackup.$(date +%Y%m%d).tar.gz -C ~jenkins config.xml plugins`
 1. Check for plugin updates that will apply to the current version of
    jenkins (Each plugin should be checked for potential issues in the readme)
 1. Repeat step 1 if necessary until jenkins does not offer any more plugins
@@ -125,6 +127,7 @@ to do an out-of-bound patch if a sufficientl sever issue is identified.
    back and create an issue to deal with them in the next cycle.
 1. Backup the main war in /usr/share/jenkins to a name with a version suffix
    in case of corruption to the main jar.
+1. Once the upgrade is done, restart agents which do not auto-restart such as the Windows ones not running as a service
 
 ### Backups
 

ansible/ansible-tower.md

@@ -86,7 +86,7 @@ hosts:
           ubuntu2404-s390x-1: {ip: 148.100.74.237, user: linux1}
 
       - skytap:
-          ubuntu2004-ppc64le-1: {ip: 20.61.136.212, description: 32CPU, 400G}
+          ubuntu2204-ppc64le-1: {ip: 20.61.136.212, description: 32CPU, 400G}
           ubuntu2204-x64-1: {ip: 20.61.136.254, description: 24 core Intel X5650}
 
   - test:
@@ -120,11 +120,11 @@ hosts:
           aix73-ppc64-1: {ip: 140.211.9.10, description: p8-aix1-adopt01.osuosl.org, 7300-01-02-2320}
           centos74-ppc64le-1: {ip: 140.211.168.228, user: centos}
           centos74-ppc64le-2: {ip: 140.211.168.217, user: centos}
-          ubuntu1604-ppc64le-1: {ip: 140.211.168.227, user: ubuntu}
-          ubuntu1604-ppc64le-2: {ip: 140.211.168.190, user: ubuntu}
-          ubuntu1804-ppc64le-1: {ip: 140.211.168.5, user: ubuntu}
-          ubuntu1804-ppc64le-2: {ip: 140.211.168.8, user: ubuntu}
-          ubuntu2004-ppc64le-1: {ip: 140.211.168.235, user: ubuntu}
+          ubuntu2404-ppc64le-1: {ip: 140.211.10.70, user: ubuntu}
+          ubuntu2404-ppc64le-2: {ip: 140.211.168.207, user: ubuntu}
+          ubuntu2404-ppc64le-3: {ip: 140.211.168.177, user: ubuntu}
+          ubuntu2404-ppc64le-4: {ip: 140.211.168.222, user: ubuntu}
+          ubuntu2404-ppc64le-5: {ip: 140.211.168.239, user: ubuntu}
           ubuntu2404-aarch64-1: {ip: 140.211.169.12, user: ubuntu}
 
       - macincloud:
@@ -144,21 +144,21 @@ hosts:
 
       # Rise machines are hosted in Scaleway
       - rise:
-          ubuntu2310-riscv64-1: {ip: 62.210.163.38, user: ubuntu}
-          ubuntu2310-riscv64-2: {ip: 62.210.163.36, user: ubuntu}
-          ubuntu2404-riscv64-1: {ip: 62.210.163.41, user: ubuntu}
+          ubuntu2404-riscv64-1: {ip: 62.210.163.198, user: ubuntu}
           ubuntu2404-riscv64-2: {ip: 62.210.163.196, user: ubuntu}
           ubuntu2404-riscv64-3: {ip: 62.210.163.99, user: ubuntu}
           ubuntu2404-riscv64-4: {ip: 62.210.163.103, user: ubuntu}
           ubuntu2404-riscv64-5: {ip: 62.210.163.45, user: ubuntu}
           ubuntu2404-riscv64-6: {ip: 62.210.163.135, user: ubuntu}
           ubuntu2404-riscv64-7: {ip: 62.210.163.137, user: ubuntu}
+          ubuntu2404-riscv64-8: {ip: 62.210.163.38, user: ubuntu}
+          ubuntu2404-riscv64-9: {ip: 62.210.163.36, user: ubuntu}
 
       - siteox:
           solaris10u11-sparcv9-1: {ip: cloud.siteox.com, port: 53322}
 
       - skytap:
-          ubuntu2004-ppc64le-1: {ip: 20.61.136.210}
+          ubuntu2404-ppc64le-1: {ip: 20.61.136.211}
 
       - ibmcloud:
           rhel6-x64-1: {ip: 169.48.4.140}