VPC: Update debian version support (#4030)

* VPC: Add Debian 11 & 12 Support

* UnixPB: Update Debian Azul Repo Addition

* UnixPB: Remove Commented Code

* VPC: Update VPC Documentation

* UnixPB: Relocate Adding Of Azul Repo

* Vagrant: Amend method of configuring non-interactive apt

Author: steelhead31

ansible/pbTestScripts/README.md

@@ -12,16 +12,19 @@ This folder contains the scripts necessary to start separate vagrant machines wi
 * Ubuntu 16.04
 * Ubuntu 18.04
 * Ubuntu 20.04
+* Ubuntu 22.04
+* Ubuntu 24.04
 * CentOS6
 * CentOS7
 * CentOS8
-* Debian8
-* Debian10
-* FreeBSD12
+* Debian11
+* Debian12
+* Fedora 40
 * Solaris10
 * Windows Server 2012 R2
+* Windows Server 2022
 
-These machines will then have the playbooks ran on them, with additional options to build JDK8 and test it.
+These machines will then have the playbooks ran on them, with additional options to build JDKXX and test it.
 
 The top level script `vagrantPlayBookCheck.sh` takes a number of options:
 
@@ -56,14 +59,14 @@ Notes:
 
 The script will first clone the repository specified by the `--fork` and `--branch` options. For example, if `--fork` is 'willsparker' and `--branch` is '1941', the repository being cloned is https://github.com/willsparker/openjdk-infrastructure/tree/1941.
 
-The script will then make a directory in the `$WORKSPACE` location called _adoptopenjdkPBTests_, in which another directory containing the log files, and the Git repository is stored. Following that, the script will run each ansible playbook on their respective VMs, writing the output to the aforementioned log files. If not defined prior to running, `$WORKSPACE` will default to `$HOME`. 
+The script will then make a directory in the `$WORKSPACE` location called _adoptopenjdkPBTests_, in which another directory containing the log files, and the Git repository is stored. Following that, the script will run each ansible playbook on their respective VMs, writing the output to the aforementioned log files. If not defined prior to running, `$WORKSPACE` will default to `$HOME`.
 
 After each playbook is ran through, a summary is given, containing which OS playbooks succeeded, failed, or were cancelled. The logs can also be perused to get more in-depth error messages.
 
 If specified, the VMs will then be tested by building JDK8 - if all dependencies are filled by the playbook as they should be, the JDK will be successfully built. If the `--test` option is then specified, the JDK will then have a simple test ran against it that will ensure it was built properly.
 
 If the VMs were chosen *not* to be destroyed, they can be later by running the _vmDestroy.sh_ script, which takes the `Vagrant OS` as an argument. If found, every Vagrant VM with this OS will be destroyed, therefore the user will be asked to confirm they want this. The `--force` option will skip this prompt.
 
-Vagrant boxes can be updated by their provider from time to time, and using outdated versions can occasionally [cause issues](https://github.com/adoptium/infrastructure/issues/2375#issue-1043540735). To ensure the current vagrant boxes used on the system are up to date, _updateBoxes.sh_ can be used. This will check and update all current vagrant boxes for the user. Outdated box versions will be removed if the `-r` option, is used. A prompt will ask the user to confirm the removal of a box, and option `-rf` will skip this prompt. 
+Vagrant boxes can be updated by their provider from time to time, and using outdated versions can occasionally [cause issues](https://github.com/adoptium/infrastructure/issues/2375#issue-1043540735). To ensure the current vagrant boxes used on the system are up to date, _updateBoxes.sh_ can be used. This will check and update all current vagrant boxes for the user. Outdated box versions will be removed if the `-r` option, is used. A prompt will ask the user to confirm the removal of a box, and option `-rf` will skip this prompt.
 
 The additional scripts in the _pbTestScripts_ folder are called from `vagrantPlaybookCheck.sh`

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml

@@ -14,7 +14,7 @@
   apt_repository: repo='ppa:openjdk-r/ppa' update_cache=no
   when:
     - (ansible_architecture != "armv7l") and (ansible_architecture != "riscv64")
-    - ansible_distribution_major_version != "10"
+    - ansible_distribution_major_version <= "10"
   tags: patch_update
 
 # Required for the apt-key task next
@@ -42,7 +42,7 @@
   apt_repository: repo='ppa:ubuntu-toolchain-r/test' update_cache=no
   when:
     - (ansible_architecture != "armv7l") and (ansible_architecture != "riscv64")
-    - ansible_distribution_major_version != "10"
+    - ansible_distribution_major_version <= "10"
   tags: patch_update
 
 # Required as 'Ubuntu Jessie' doesn't exist. See openjdk-infrastructure issue #1015
@@ -59,20 +59,6 @@
     - ansible_distribution_major_version == "8"
   tags: patch_update
 
-- name: Add Azul Zulu GPG Package Signing Key for x86_64
-  apt_key:
-    url: https://repos.azulsystems.com/RPM-GPG-KEY-azulsystems
-    state: present
-  when:
-    - ansible_architecture == "x86_64"
-  tags: [patch_update, azul-key]
-
-- name: Add Azul Zulu repository for x86_64
-  apt_repository: repo='deb https://repos.azulsystems.com/ubuntu stable main'
-  when:
-    - ansible_architecture == "x86_64"
-  tags: patch_update
-
 # Both repositories needed for gcc/g++-4.8
 - name: Add additional repositories for Raspbian Buster
   apt_repository: repo={{ item }}
@@ -192,6 +178,42 @@
     - ansible_architecture == "riscv64"
   tags: build_tools
 
+# Add Azul Repositories To Provide Boot JDK7 for JDK8 Builds
+
+# Install Azul Key On x64
+- name: Install Azul repo key (dearmored keyring)
+  ansible.builtin.shell: |
+    set -euo pipefail
+    curl -fsSL https://repos.azul.com/azul-repo.key \
+    | gpg --dearmor \
+    | tee /usr/share/keyrings/azul.gpg >/dev/null
+  args:
+    executable: /bin/bash
+  when: ansible_architecture == "x86_64"
+  tags: [patch_update, azul-key]
+  become: true
+
+- name: Ensure Azul key permissions are readable by APT
+  ansible.builtin.file:
+    path: /usr/share/keyrings/azul.gpg
+    mode: '0644'
+    owner: root
+    group: root
+    state: file
+  when: ansible_architecture == "x86_64"
+  tags: [patch_update, azul-key]
+  become: true
+
+- name: Add Azul Zulu repository for x86_64 (signed-by keyring)
+  ansible.builtin.apt_repository:
+    repo: "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main"
+    filename: zulu
+    state: present
+    update_cache: yes
+  when: ansible_architecture == "x86_64"
+  tags: patch_update
+  become: true
+
 #########################
 # Additional Test Tools #
 #########################

ansible/vagrant/Vagrantfile.Debian11

@@ -0,0 +1,34 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+$script = <<SCRIPT
+# Configure DPKG to be noninteractive
+ENV DEBIAN_FRONTEND=noninteractive 
+# Update Repository Addresses For Debian
+sudo apt-get update
+sudo apt-get install tree -y
+sudo apt-get install software-properties-common -y
+sudo apt-get install gpg -y
+
+# Put the host machine's IP into the authorised_keys file on the VM
+if [ -r /vagrant/id_rsa.pub ]; then
+        mkdir -p $HOME/.ssh && cat /vagrant/id_rsa.pub >> $HOME/.ssh/authorized_keys
+fi
+SCRIPT
+
+# 2 = version of configuration file for Vagrant 1.1+ leading up to 2.0.x
+Vagrant.configure("2") do |config|
+
+  config.vm.define :adoptopenjdkD11 do |adoptopenjdkD11|
+    adoptopenjdkD11.vm.box = "debian/bullseye64"
+    adoptopenjdkD11.vm.synced_folder ".", "/vagrant"
+    adoptopenjdkD11.vm.hostname = "adoptopenjdkD11"
+    adoptopenjdkD11.vm.network :private_network, type: "dhcp"
+    adoptopenjdkD11.vm.provision "shell", inline: $script, privileged: false
+  end
+  config.vm.provider "virtualbox" do |v|
+    v.gui = false
+    v.memory = 2560
+    v.customize ["modifyvm", :id, "--cpuexecutioncap", "50"]
+  end
+end

ansible/vagrant/Vagrantfile.Debian12

@@ -0,0 +1,34 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+$script = <<SCRIPT
+# Configure DPKG to be noninteractive
+ENV DEBIAN_FRONTEND=noninteractive 
+# Update Repository Addresses For Debian
+sudo apt-get update
+sudo apt-get install tree -y
+sudo apt-get install software-properties-common -y
+sudo apt-get install gpg -y
+
+# Put the host machine's IP into the authorised_keys file on the VM
+if [ -r /vagrant/id_rsa.pub ]; then
+        mkdir -p $HOME/.ssh && cat /vagrant/id_rsa.pub >> $HOME/.ssh/authorized_keys
+fi
+SCRIPT
+
+# 2 = version of configuration file for Vagrant 1.1+ leading up to 2.0.x
+Vagrant.configure("2") do |config|
+
+  config.vm.define :adoptopenjdkD12 do |adoptopenjdkD12|
+    adoptopenjdkD12.vm.box = "debian/bookworm64"
+    adoptopenjdkD12.vm.synced_folder ".", "/vagrant"
+    adoptopenjdkD12.vm.hostname = "adoptopenjdkD12"
+    adoptopenjdkD12.vm.network :private_network, type: "dhcp"
+    adoptopenjdkD12.vm.provision "shell", inline: $script, privileged: false
+  end
+  config.vm.provider "virtualbox" do |v|
+    v.gui = false
+    v.memory = 2560
+    v.customize ["modifyvm", :id, "--cpuexecutioncap", "50"]
+  end
+end