Merge branch 'master' into dependabot/github_actions/actions/checkout…

…-4.1.1

.github/labeler.yml

@@ -9,20 +9,22 @@
 
 # label_name:
 #   - path/to/file_or_folder
+
 ghActions:
-    - .github/workflows/**/*
+- changed-files:
+  - any-glob-to-any-file: [.github/*]
 doc:
-    - docs/*
-    - '**/*.md'
+- changed-files:
+    - any-glob-to-any-file: [docs/*, '**/*.md']
 Vagrant:
-    - ansible/pbTestScripts/**/*
-    - ansible/vagrant/Vagrantfile*
+- changed-files:
+    - any-glob-to-any-file: [ansible/pbTestScripts/**/*, ansible/vagrant/Vagrantfile*]
 pbTests:
-    - ansible/pbTestScripts/**/*
+- changed-files:
+    - any-glob-to-any-file: [ansible/pbTestScripts/**/*]
 docker:
-    - ansible/docker/Dockerfile*
+- changed-files:
+    - any-glob-to-any-file: [ansible/docker/Dockerfile*]
 ansible:
-    - ansible/playbooks/**/*
-    - ansible/plugins/**/*
-    - ansible/inventory.yml
-    - ansible/ansible.cfg
+- changed-files:
+    - any-glob-to-any-file: [ansible/playbooks/**/*, ansible/plugins/**/*, ansible/inventory.yml, ansible/ansible.cfg]

.github/workflows/build_mac.yml

@@ -17,7 +17,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-11]
+        include:
+          - os: [macos-11]
+          - os: [macos-13]
     steps:
 
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

.github/workflows/check_dockerstatic.yml

@@ -25,14 +25,8 @@ jobs:
       max-parallel: 4
       matrix:
        include:
-         - os: alpine13.1
-           dockerfile: "Dockerfile.alp311"
-         - os: alpine13.2
-           dockerfile: "Dockerfile.alp312"
-         - os: alpine13.3
-           dockerfile: "Dockerfile.alp313"
-         - os: alpine13.4
-           dockerfile: "Dockerfile.alp314"
+         - os: alpine3.19
+           dockerfile: "Dockerfile.alp319"
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Test Dockerfile on ${{ matrix.os }}
@@ -65,12 +59,8 @@ jobs:
       max-parallel: 4
       matrix:
        include:
-         - os: fedora33
-           dockerfile: "Dockerfile.f33"
-         - os: fedora34
-           dockerfile: "Dockerfile.f34"
-         - os: fedora35
-           dockerfile: "Dockerfile.f35"
+         - os: fedora39
+           dockerfile: "Dockerfile.f39"
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Test Dockerfile on ${{ matrix.os }}
@@ -86,14 +76,12 @@ jobs:
       max-parallel: 4
       matrix:
        include:
-         - os: ubuntu16.04
-           dockerfile: "Dockerfile.u1604"
          - os: ubuntu18.04
            dockerfile: "Dockerfile.u1804"
          - os: ubuntu20.04
            dockerfile: "Dockerfile.u2004"
-         - os: ubuntu21.04
-           dockerfile: "Dockerfile.u2104"
+         - os: ubuntu22.04
+           dockerfile: "Dockerfile.u2204"
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Test Dockerfile on ${{ matrix.os }}

.github/workflows/code-freeze.yml

@@ -7,6 +7,10 @@ on:
   issue_comment:
     types: [created]
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   codefreeze:
     uses: adoptium/.github/.github/workflows/code-freeze.yml@main

.github/workflows/labeler.yml

@@ -5,17 +5,22 @@ on:
   pull_request_target:
   issues:
   issue_comment:
-
+  
 jobs:
   triage:
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: write
     runs-on: ubuntu-latest
+    name: Assign Labels
     steps:
-    - uses: actions/labeler@5c7539237e04b714afd8ad9b4aed733815b9fab4 # v4.0.2
+    - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
       if: ${{ github.event.pull_request }}
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
 
-    - uses: fuxingloh/multi-labeler@fb9bc28b2d65e406ffd208384c5095793c3fd59a # v1.8.0
+    - uses: fuxingloh/multi-labeler@b15a54460c38f54043fa75f7b08a0e2aa5b94b5b # v4.0.0
       with:
         github-token: "${{secrets.GITHUB_TOKEN}}"
         config-path: .github/regex_labeler.yml

ansible/docker/Dockerfile.Ubuntu2204

@@ -18,7 +18,6 @@ RUN rm -rf /ansible
 
 RUN groupadd -g 1000 ${user}
 RUN useradd -c "Jenkins user" -d /home/${user} -u 1000 -g 1000 -m ${user}
-RUN mv /bin/uname /bin/uname.real && echo "/bin/uname.real \$@ | sed 's/aarch64/armv7l/g'" > /bin/uname && chmod 755 /bin/uname
 
 ENV \
     JDK7_BOOT_DIR="/usr/lib/jvm/jdk8" \

ansible/inventory.yml

@@ -52,9 +52,6 @@ hosts:
       - equinix_esxi:
           solaris10-x64-1: {ip: 145.40.115.43}
 
-      - macstadium:
-          macos1014-x64-1: {ip: 208.83.1.170, user: Administrator, description: G3B i7-4C/16G/250G}
-
       - marist:
           rhel79-s390x-1: {ip: 148.100.75.212, user: linux1}
           rhel79-s390x-2: {ip: 148.100.74.54, user: linux1}
@@ -86,6 +83,9 @@ hosts:
 
   - dockerhost:
 
+      - azure:
+          ubuntu2204-x64-1: {ip: 52.180.147.157, description: Xeon Platinum 8272CL, 16 cores, 64GB}
+
       - equinix:
           ubuntu2204-x64-1: {ip: 145.40.113.173, description: Intel Xeon Gold 40 core}
           ubuntu2004-x64-1: {ip: 145.40.114.58, description: AMD EPYC 7401P 24 core}
@@ -94,6 +94,7 @@ hosts:
 
       - osuosl:
           ubuntu2004-ppc64le-1: {ip: 140.211.168.214}
+          ubuntu2204-aarch64-1: {ip: 140.211.167.67}
 
       - marist:
           ubuntu2204-s390x-1: {ip: 148.100.74.237, user: linux1}
@@ -147,7 +148,6 @@ hosts:
 
       - macstadium:
           macos1014-x64-1: {ip: 207.254.29.43, user: administrator, description: G3B i7/4C/16G/250G}
-          macos11-arm64-2: {ip: 199.7.163.52, user: Administrator, description: G5A M1/8C/8G/256G}
 
       - marist:
           rhel7-s390x-2: {ip: 148.100.74.92}
@@ -162,6 +162,10 @@ hosts:
           macos1015-x64-1: {ip: 10.0.40.10, ipv6: "2a02:418:3001:40::10", user: administrator}
           macos1015-x64-2: {ip: 10.0.40.11, ipv6: "2a02:418:3001:40::11", user: administrator}
 
+      - scaleway:
+          ubuntu2310-riscv64-1: {ip: 62.210.163.13, user: ubuntu}
+          ubuntu2310-riscv64-2: {ip: 62.210.163.98, user: ubuntu}
+
       - siteox:
           solaris10u11-sparcv9-1: {ip: cloud.siteox.com, port: 53322}
 

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/dockernode.yml

@@ -0,0 +1,18 @@
+---
+###############################
+# Adoptium - Ansible Playbook #
+###############################
+# This playbook is used to deploy static docker containers onto dockerhost machines
+# https://github.com/adoptium/infrastructure/issues/3370
+
+- name: Dockernode playbook
+  hosts: all
+  gather_facts: yes
+
+  roles:
+    - role: Debug
+      tags: debug
+    - role: Get_Vendor_Files
+      tags: deploy
+    - role: deploy_container
+      tags: deploy

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml

@@ -107,7 +107,6 @@
       when:
         - (ansible_distribution != "Alpine" or ansible_architecture != "aarch64")
         - ansible_distribution != "Solaris"
-        - ansible_architecture != "riscv64"
       tags: build_tools
     - role: adoptopenjdk_install  # Previous LTS
       jdk_version: 17

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Clean_Up/tasks/main.yml

@@ -20,8 +20,6 @@
 
 - name: Remove yum dependencies that are no longer required - RedHat and CentOS
   command: yum -y autoremove
-  args:
-    warn: no
   when:
     - (ansible_distribution == "RedHat" and ansible_distribution_major_version != "6") or (ansible_distribution == "CentOS" and ansible_distribution_major_version != "6")
     - ansible_architecture != "aarch64"

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/MacOSX.yml

@@ -21,7 +21,6 @@ Build_Tool_Packages_NOT_10_12:
   - ccache # ccache is no longer working on macOS 10.12
 
 Build_Tool_Casks:
-  - adoptopenjdk10
   - packages
 
 Test_Tool_Packages: