Merge branch 'master' into faq_aqa_branch

adoptium · May 15, 2024 · 3ed7e44 · 3ed7e44
2 parents c2a5e5b + ff43196
commit 3ed7e44
Show file tree

Hide file tree

Showing 15 changed files with 125 additions and 102 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
     - name: Set up Docker Buildx to use cache feature
       uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
@@ -65,7 +65,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
     - name: Set up Docker Buildx to use cache feature
       uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0

diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml
@@ -22,7 +22,7 @@ jobs:
           - os: [macos-14]
     steps:
 
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
     - name: Install dependencies
       run: brew install ansible

diff --git a/.github/workflows/build_qemu.yml b/.github/workflows/build_qemu.yml
@@ -36,7 +36,7 @@ jobs:
           #   distro: jessie
 
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
       - name: Run on architecture
         uses: uraimo/run-on-arch-action@b0ffb25eb00af00468375982384441f063da1741 # v2.7.2

diff --git a/.github/workflows/build_vagrant.yml b/.github/workflows/build_vagrant.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
     - name: Update Repos
       run: sudo apt-get update

diff --git a/.github/workflows/build_wsl.yml b/.github/workflows/build_wsl.yml
@@ -41,7 +41,7 @@ jobs:
         .\ConfigureRemotingForAnsible.ps1 -ForceNewSSLCert
         .\ConfigureRemotingForAnsible.ps1 -SkipNetworkProfileCheck
 
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
     - uses: Vampire/setup-wsl@d4e837996638afd047e7b468de70e28fe76cf75a # v3.0.0
 

diff --git a/.github/workflows/check_dockerstatic.yml b/.github/workflows/check_dockerstatic.yml
@@ -28,7 +28,7 @@ jobs:
          - os: alpine3.19
            dockerfile: "Dockerfile.alp319"
     steps:
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
     - name: Test Dockerfile on ${{ matrix.os }}
       env:
         DOCKERFILE: ${{ matrix.dockerfile }}
@@ -45,7 +45,7 @@ jobs:
          - os: centos8
            dockerfile: "Dockerfile.cent8"
     steps:
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
     - name: Test Dockerfile on ${{ matrix.os }}
       env:
         DOCKERFILE: ${{ matrix.dockerfile }}
@@ -62,7 +62,7 @@ jobs:
          - os: fedora39
            dockerfile: "Dockerfile.f39"
     steps:
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
     - name: Test Dockerfile on ${{ matrix.os }}
       env:
         DOCKERFILE: ${{ matrix.dockerfile }}
@@ -83,7 +83,7 @@ jobs:
          - os: ubuntu22.04
            dockerfile: "Dockerfile.u2204"
     steps:
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
     - name: Test Dockerfile on ${{ matrix.os }}
       env:
         DOCKERFILE: ${{ matrix.dockerfile }}

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
     - name: 'Yamllint'
       uses: karancode/yamllint-github-action@fdef6bc189425ecc84cc4543b2674566c0827053 # v2.1.1
@@ -39,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
     - name: Set up Python 3.x
       uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0

diff --git a/ansible/DockerInventory.json b/ansible/DockerInventory.json
@@ -26,9 +26,13 @@
             {
                 "nodeName": "test-docker-ubuntu2204-x64-2",
                 "port": "32778"
+            },
+            {
+                "nodeName": "test-docker-ubuntu2404-x64-1",
+                "port": "32782"
             }
         ],
-        "containersCount": 6
+        "containersCount": 7
     },
     {
         "name": "dockerhost-azure-ubuntu2204-x64-2",
@@ -42,6 +46,10 @@
                 "nodeName": "test-docker-alpine319-x64-3",
                 "port": "32771"
             },
+            {
+                "nodeName": "test-docker-amazon2023-x64-1",
+                "port": "32776"
+            },
             {
                 "nodeName": "test-docker-debian12-x64-3",
                 "port": "32770"
@@ -52,7 +60,7 @@
             },
             {
                 "nodeName": "test-docker-ubuntu2004-x64-4",
-                "port": "32768"
+                "port": "32775"
             },
             {
                 "nodeName": "test-docker-ubuntu2204-x64-6",
@@ -63,7 +71,7 @@
                 "port": "32772"
             }
         ],
-        "containersCount": 7
+        "containersCount": 8
     },
     {
         "name": "dockerhost-equinix-ubuntu2004-armv8-1",
@@ -77,6 +85,14 @@
                 "nodeName": "test-docker-alpine319-armv8-4",
                 "port": "32777"
             },
+            {
+                "nodeName": "test-docker-amazon2023-armv8l-1",
+                "port": "32779"
+            },
+            {
+                "nodeName": "test-docker-debian12-armv7l-1",
+                "port": "32778"
+            },
             {
                 "nodeName": "test-docker-fedora39-armv8l-1",
                 "port": "2234"
@@ -122,7 +138,7 @@
                 "port": "32776"
             }
         ],
-        "containersCount": 13
+        "containersCount": 15
     },
     {
         "name": "dockerhost-equinix-ubuntu2204-armv8-1",
@@ -167,9 +183,17 @@
             {
                 "nodeName": "test-docker-ubuntu2204-armv8-3",
                 "port": "32771"
+            },
+            {
+                "nodeName": "test-docker-ubuntu2404-armv7l-1",
+                "port": "32774"
+            },
+            {
+                "nodeName": "test-docker-ubuntu2404-armv8-1",
+                "port": "32773"
             }
         ],
-        "containersCount": 10
+        "containersCount": 12
     },
     {
         "name": "dockerhost-marist-ubuntu2204-s390x-1",
@@ -182,9 +206,13 @@
             {
                 "nodeName": "test-docker-sles15-s390x-1",
                 "port": "32768"
+            },
+            {
+                "nodeName": "test-docker-ubuntu2404-s390x-1",
+                "port": "32770"
             }
         ],
-        "containersCount": 2
+        "containersCount": 3
     },
     {
         "name": "dockerhost-osuosl-ubuntu2004-ppc64le-1",
@@ -224,12 +252,6 @@
         ],
         "containersCount": 2
     },
-    {
-        "name": "dockerhost-rise-ubuntu2204-aarch64-1",
-        "ip": "34.72.108.242",
-        "containers": [],
-        "containersCount": 0
-    },
     {
         "name": "dockerhost-skytap-ubuntu2004-ppc64le-1",
         "ip": "20.61.136.212",
@@ -257,9 +279,13 @@
             {
                 "nodeName": "test-docker-ubuntu2204-ppc64le-2",
                 "port": "32772"
+            },
+            {
+                "nodeName": "test-docker-ubuntu2404-ppc64le-1",
+                "port": "32774"
             }
         ],
-        "containersCount": 6
+        "containersCount": 7
     },
     {
         "name": "dockerhost-skytap-ubuntu2204-x64-1",
@@ -269,27 +295,15 @@
                 "nodeName": "test-docker-alpine319-x64-1",
                 "port": "32787"
             },
-            {
-                "nodeName": "test-docker-centos7-x64-1",
-                "port": "32782"
-            },
             {
                 "nodeName": "test-docker-debian12-x64-1",
                 "port": "32778"
             },
-            {
-                "nodeName": "test-docker-fedora39-x64-1",
-                "port": "32779"
-            },
             {
                 "nodeName": "test-docker-ubi8-x64-3",
                 "port": "32790"
-            },
-            {
-                "nodeName": "test-docker-ubuntu2004-x64-3",
-                "port": "32783"
             }
         ],
-        "containersCount": 6
+        "containersCount": 3
     }
 ]
diff --git a/ansible/inventory.yml b/ansible/inventory.yml
@@ -1,7 +1,7 @@
 ---
 
 #
-# AdoptOpenJDK hosts! check the readme on how to add more
+# Eclipse Adoptium hosts! check the readme on how to add more
 # (if its not obvious enough).
 # Initial host names are "os-arch-index" within each stanza
 #
@@ -144,14 +144,18 @@ hosts:
           ubuntu2004-s390x-1: {ip: 148.100.74.240}
           ubuntu2204-s390x-1: {ip: 148.100.74.105}
 
-      # Nine machines are behind a firewall. Please contact @sxa or @gdams for access
-      - nine:
-          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}
+      # 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}
+          ubuntu2310-riscv64-3: {ip: 62.210.163.3, user: ubuntu}
+          ubuntu2310-riscv64-4: {ip: 62.210.163.137, user: ubuntu}
+          ubuntu2310-riscv64-5: {ip: 62.210.163.45, user: ubuntu}
+          ubuntu2310-riscv64-6: {ip: 62.210.163.168, user: ubuntu}
+          ubuntu2310-riscv64-7: {ip: 62.210.163.105, user: ubuntu}
+          ubuntu2310-riscv64-8: {ip: 62.210.163.164, user: ubuntu}
+          ubuntu2310-riscv64-9: {ip: 62.210.163.6, user: ubuntu}
+          ubuntu2310-riscv64-10: {ip: 62.210.163.102, user: ubuntu}
 
       - siteox:
           solaris10u11-sparcv9-1: {ip: cloud.siteox.com, port: 53322}

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/main.yml
@@ -79,7 +79,6 @@
         state: present
       when:
         - (ansible_distribution == "Ubuntu" or ansible_distribution == "Debian") or (ansible_distribution == "SLES") or ((ansible_distribution == "RedHat" or ansible_distribution == "CentOS" ) and ansible_distribution_major_version == "7")
-        - ansible_architecture != "riscv64"
       tags:
         - jenkins
 
@@ -91,7 +90,6 @@
         state: present
       when:
         - (ansible_distribution == "Ubuntu" or ansible_distribution == "Debian") or (ansible_distribution == "SLES") or ((ansible_distribution == "RedHat" or ansible_distribution == "CentOS" ) and ansible_distribution_major_version == "7")
-        - ansible_architecture != "riscv64"
         - Nagios_Plugins == "Enabled"
       tags:
         - docker
@@ -103,6 +101,5 @@
     enabled: yes
   when:
     - (ansible_distribution == "Ubuntu" or ansible_distribution == "Debian") or (ansible_distribution == "SLES") or ((ansible_distribution == "RedHat" or ansible_distribution == "CentOS" ) and ansible_distribution_major_version == "7")
-    - ansible_architecture != "riscv64"
   tags:
     - docker
diff --git a/...ble/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.al2023 b/...ble/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.al2023
@@ -0,0 +1,37 @@
+FROM amazonlinux:2023
+
+RUN dnf -y update && dnf install -y perl openssh-server unzip zip wget tar
+RUN dnf install -y --allowerasing gnupg2
+RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -P ""
+# Get latest jdk21 ga
+RUN wget -q 'https://api.adoptium.net/v3/binary/latest/21/ga/linux/x64/jdk/hotspot/normal/eclipse?project=jdk' -O /tmp/jdk21.tar.gz
+RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B
+# Get sig file for latest jdk21 ga
+RUN wget -q `curl -s 'https://api.adoptium.net/v3/assets/feature_releases/21/ga?architecture=x64&heap_size=normal&image_type=jdk&jvm_impl=hotspot&os=linux&page=0&page_size=1&project=jdk&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}'` -O /tmp/jdk21.sig
+RUN gpg --verify /tmp/jdk21.sig /tmp/jdk21.tar.gz
+RUN mkdir -p /usr/lib/jvm/jdk21 && tar -xpzf /tmp/jdk21.tar.gz -C /usr/lib/jvm/jdk21 --strip-components=1
+# Install ant 1.10.12
+RUN wget -q -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.12-bin.zip'
+RUN wget -q -O /tmp/ant-contrib.tgz  https://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib-1.0b2/ant-contrib-1.0b2-bin.tar.gz
+RUN echo "7e6fbcc3563df4bd87c883ad86a161a71da2774e0ed71a1b3aad82cbff1a7656ed9a0acb5ce40652129376dfd79f1ef74ec3369c1067d412a63062fea62ceccd  /tmp/ant.zip" > /tmp/ant.sha512
+RUN echo "0fd2771dca2b8b014a4cb3246715b32e20ad5d26754186d82eee781507a183d5e63064890b95eb27c091c93c1209528a0b18a6d7e6901899319492a7610e74ad  /tmp/ant-contrib.tgz" >> /tmp/ant.sha512
+RUN sha512sum --check --strict /tmp/ant.sha512
+RUN ln -s /usr/local/apache-ant-1.10.12/bin/ant /usr/bin/ant
+RUN unzip -q -d /usr/local /tmp/ant.zip
+RUN tar xpfz /tmp/ant-contrib.tgz -C /usr/local/apache-ant-1.10.12/lib --strip-components=2 ant-contrib/lib/ant-contrib.jar
+# Clear up space
+RUN rm /tmp/jdk21.tar.gz /tmp/ant.zip /tmp/ant-contrib.tgz /tmp/jdk21.sig
+# Set up jenkins user
+RUN useradd -m -d /home/jenkins jenkins
+RUN mkdir /home/jenkins/.ssh
+RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys
+RUN chown -R jenkins /home/jenkins/.ssh
+RUN chmod -R og-rwx /home/jenkins/.ssh
+# RUN service ssh start
+CMD ["/usr/sbin/sshd","-D"]
+RUN dnf install -y --allowerasing git curl make gcc xorg-x11-server-Xvfb libXrender libXi libXtst procps glibc-langpack-en fontconfig which hostname fakeroot shared-mime-info
+# Install Packages For openssl
+RUN dnf -y update && dnf install -y openssl gnutls gnutls-utils nss-devel nss-tools
+# ENTRYPOINT /usr/lib/jvm/jdk21/bin/java
+EXPOSE 22
+# Start with docker run -p 2222:22 UUID
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Providers/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Providers/tasks/main.yml
@@ -66,9 +66,9 @@
     - providers
     - adoptopenjdk
 
-#####################
-# Marist & Scaleway #
-#####################
+############################
+# Marist & Rise (Scaleway) #
+############################
 
 # Marist & Scaleway machines need their host template updated for changes to /etc/hosts to persist
 - name: Update /etc/cloud/cloud.cfg file - To remove update hosts function
@@ -78,7 +78,7 @@
     state: absent
   when:
     - provider_name.rc == 0
-    - (provider_name.stdout == "marist" or provider_name.stdout == "scaleway")
+    - (provider_name.stdout == "marist" or provider_name.stdout == "rise")
   tags:
     - providers
     - adoptopenjdk