From 90d01b6d11ba340a486af3b52d95905d50fbd0e0 Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Fri, 24 Nov 2023 08:30:22 +0000
Subject: [PATCH 01/10] Add Ubuntu 22 Vagrantfile

---
 ansible/vagrant/Vagrantfile.Ubuntu2204 | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 ansible/vagrant/Vagrantfile.Ubuntu2204

diff --git a/ansible/vagrant/Vagrantfile.Ubuntu2204 b/ansible/vagrant/Vagrantfile.Ubuntu2204
new file mode 100644
index 0000000000..ec2bb33047
--- /dev/null
+++ b/ansible/vagrant/Vagrantfile.Ubuntu2204
@@ -0,0 +1,26 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+$script = <<SCRIPT
+# 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 :adoptopenjdkU22 do |adoptopenjdkU22|
+    adoptopenjdkU22.vm.box = "bento/ubuntu-22.04"
+    adoptopenjdkU22.vm.synced_folder ".", "/vagrant"
+    adoptopenjdkU22.vm.hostname = "adoptopenjdkU22"
+    adoptopenjdkU22.vm.network :private_network, type: "dhcp"
+    adoptopenjdkU22.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

From a47ff20e2b58535c76fcb2709a5af15081717cbb Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Fri, 24 Nov 2023 08:30:34 +0000
Subject: [PATCH 02/10] Fix NASM compilation on Ubuntu 22.04

---
 .../roles/nasm/tasks/main.yml                 | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
index 3a12fd1170..17ea114995 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
@@ -36,12 +36,27 @@
   stat: path=/usr/local/gcc/bin/gcc-7.5
   register: gcc7
   tags: nasm
+
 - name: Setting CC to gcc-7.5 binary found
   set_fact:
     CC: "/usr/local/gcc/bin/gcc-7.5"
   when: gcc7.stat.exists and CC is not defined
   tags: nasm
 
+## For Ubuntu 22+ Set GCC to gcc_11
+
+- name: Checking for gcc-11 binary installation
+  stat: path=/usr/bin/gcc-11
+  register: gcc11
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int >= 22
+  tags: nasm
+
+- name: Setting CC to gcc-11 binary found
+  set_fact:
+    CC: "/usr/bin/gcc-11"
+  when: gcc11.stat.exists and ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int >= 22
+  tags: nasm
+
 - name: Print 'CC' variable
   debug:
     msg: "VARIABLE CC SET TO {{ CC }}"
@@ -85,6 +100,27 @@
     - (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) )
   tags: nasm
 
+## Patch NASM Source On Ubuntu 22.04 due to bug with compiling with gcc 8+
+## See With https://src.fedoraproject.org/rpms/nasm/raw/0cc3eb244bd971df81a7f02bc12c5ec259e1a5d6/f/0001-Remove-invalid-pure_func-qualifiers.patch
+
+- name: Patch NASM 13.03 Source
+  lineinfile:
+    path: /tmp/nasm-2.13.03/include/nasmlib.h
+    regexp: '^void pure_func seg_init\(void\);.*$'
+    line: 'void seg_init(void);'
+  when:
+    - (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) ) and (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int >= 22)
+  tags: nasm
+
+- name: Patch NASM 13.03 Source
+  lineinfile:
+    path: /tmp/nasm-2.13.03/include/nasmlib.h
+    regexp: '^int32_t pure_func seg_alloc\(void\);.*$'
+    line: 'int32_t seg_alloc(void);'
+  when:
+    - (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) ) and (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int >= 22)
+  tags: nasm
+
 - name: Running ./configure & make for nasm
   shell: cd /tmp/nasm-2.13.03 && CC={{ CC }} ./configure -prefix=/usr/local && make install
   when:

From fb4bd0dada60199b24b312308e6bb3d203d128de Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Fri, 24 Nov 2023 08:32:43 +0000
Subject: [PATCH 03/10] Update Vagrant clean script

---
 ansible/pbTestScripts/vmDestroy.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ansible/pbTestScripts/vmDestroy.sh b/ansible/pbTestScripts/vmDestroy.sh
index 230ea99812..db09f90f53 100755
--- a/ansible/pbTestScripts/vmDestroy.sh
+++ b/ansible/pbTestScripts/vmDestroy.sh
@@ -47,6 +47,8 @@ checkOS() {
                         osToDestroy="U20";;
                 "Ubuntu2104" | "U21" | "u21" )
                         osToDestroy="U21";;
+								"Ubuntu2204" | "U22" | "u22" )
+				                        osToDestroy="U22";;
                 "CentOS6" | "centos6" | "C6" | "c6" )
                         osToDestroy="C6" ;;
                 "CentOS7" | "centos7" | "C7" | "c7" )
@@ -66,7 +68,7 @@ checkOS() {
   	"Windows2022" | "Win2022" | "W22" | "w22" )
 	                       osToDestroy="W2022";;
 	              "all" )
-                        osToDestroy="U16 U18 U20 U21 C6 C7 C8 D8 D10 FBSD12 Sol10 W2012" ;;
+                        osToDestroy="U16 U18 U20 U21 U22 6 C7 C8 D8 D10 FBSD12 Sol10 W2012 W2022" ;;
 		"")
 			echo "No OS detected. Did you miss the '-o' option?" ; usage; exit 1;;
 		*) echo "$OS is not a currently supported OS" ; listOS; exit 1;
@@ -80,6 +82,7 @@ listOS() {
 		- Ubuntu1804
 		- Ubuntu2004
 		- Ubuntu2104
+		- Ubuntu2204
 		- CentOS6
 		- CentOS7
 		- CentOS8

From cee5fb844207a13b5f18e5a28982de19bae3a464 Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Fri, 24 Nov 2023 08:47:38 +0000
Subject: [PATCH 04/10] Vagrantfile updates

---
 ansible/vagrant/Vagrantfile.Ubuntu2204 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ansible/vagrant/Vagrantfile.Ubuntu2204 b/ansible/vagrant/Vagrantfile.Ubuntu2204
index ec2bb33047..5e9b5dacee 100644
--- a/ansible/vagrant/Vagrantfile.Ubuntu2204
+++ b/ansible/vagrant/Vagrantfile.Ubuntu2204
@@ -20,7 +20,8 @@ Vagrant.configure("2") do |config|
   end
   config.vm.provider "virtualbox" do |v|
     v.gui = false
-    v.memory = 2560
+    v.memory = 4096
+    v.cpus = 2
     v.customize ["modifyvm", :id, "--cpuexecutioncap", "50"]
   end
 end

From bba270571286868737dde5256407c10aa18d2123 Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Fri, 24 Nov 2023 10:50:50 +0000
Subject: [PATCH 05/10] Increase Windows VM Boot Timeouts

---
 ansible/vagrant/Vagrantfile.Win2012 | 1 +
 ansible/vagrant/Vagrantfile.Win2022 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ansible/vagrant/Vagrantfile.Win2012 b/ansible/vagrant/Vagrantfile.Win2012
index 6415c5734a..ffcb48d882 100644
--- a/ansible/vagrant/Vagrantfile.Win2012
+++ b/ansible/vagrant/Vagrantfile.Win2012
@@ -51,4 +51,5 @@ Vagrant.configure("2") do |config|
     v.memory = 5120
     v.customize ["modifyvm", :id, "--cpuexecutioncap", "50"]
   end
+  config.vm.boot_timeout = 600
 end
diff --git a/ansible/vagrant/Vagrantfile.Win2022 b/ansible/vagrant/Vagrantfile.Win2022
index c106238bea..cb21ebf89f 100644
--- a/ansible/vagrant/Vagrantfile.Win2022
+++ b/ansible/vagrant/Vagrantfile.Win2022
@@ -50,4 +50,5 @@ Vagrant.configure("2") do |config|
     v.cpus = 2
     v.customize ["modifyvm", :id, "--cpuexecutioncap", "50"]
   end
+  config.vm.boot_timeout = 600
 end

From b20fed478bebce59feada0a957900bf274c108a4 Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Fri, 24 Nov 2023 11:59:50 +0000
Subject: [PATCH 06/10] Fix NASM Ubuntu logic

---
 .../AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
index 17ea114995..c921f2fc23 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
@@ -45,10 +45,9 @@
 
 ## For Ubuntu 22+ Set GCC to gcc_11
 
-- name: Checking for gcc-11 binary installation
+- name: Checking for /usr/bin/gcc-11
   stat: path=/usr/bin/gcc-11
   register: gcc11
-  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int >= 22
   tags: nasm
 
 - name: Setting CC to gcc-11 binary found

From 348016847a888faba58d55c17104fd9d62eeb648 Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Tue, 28 Nov 2023 16:25:11 +0000
Subject: [PATCH 07/10] Fix NASM compilation on Ubuntu 22.04

---
 .../roles/nasm/tasks/main.yml                 | 44 ++++---------------
 1 file changed, 9 insertions(+), 35 deletions(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
index c921f2fc23..c559b58138 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
@@ -36,26 +36,12 @@
   stat: path=/usr/local/gcc/bin/gcc-7.5
   register: gcc7
   tags: nasm
-
 - name: Setting CC to gcc-7.5 binary found
   set_fact:
     CC: "/usr/local/gcc/bin/gcc-7.5"
   when: gcc7.stat.exists and CC is not defined
   tags: nasm
 
-## For Ubuntu 22+ Set GCC to gcc_11
-
-- name: Checking for /usr/bin/gcc-11
-  stat: path=/usr/bin/gcc-11
-  register: gcc11
-  tags: nasm
-
-- name: Setting CC to gcc-11 binary found
-  set_fact:
-    CC: "/usr/bin/gcc-11"
-  when: gcc11.stat.exists and ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int >= 22
-  tags: nasm
-
 - name: Print 'CC' variable
   debug:
     msg: "VARIABLE CC SET TO {{ CC }}"
@@ -99,31 +85,19 @@
     - (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) )
   tags: nasm
 
-## Patch NASM Source On Ubuntu 22.04 due to bug with compiling with gcc 8+
-## See With https://src.fedoraproject.org/rpms/nasm/raw/0cc3eb244bd971df81a7f02bc12c5ec259e1a5d6/f/0001-Remove-invalid-pure_func-qualifiers.patch
-
-- name: Patch NASM 13.03 Source
-  lineinfile:
-    path: /tmp/nasm-2.13.03/include/nasmlib.h
-    regexp: '^void pure_func seg_init\(void\);.*$'
-    line: 'void seg_init(void);'
-  when:
-    - (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) ) and (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int >= 22)
-  tags: nasm
-
-- name: Patch NASM 13.03 Source
-  lineinfile:
-    path: /tmp/nasm-2.13.03/include/nasmlib.h
-    regexp: '^int32_t pure_func seg_alloc\(void\);.*$'
-    line: 'int32_t seg_alloc(void);'
+- name: Running ./configure & make for nasm ( Not Ubuntu 22+ )
+  shell: cd /tmp/nasm-2.13.03 && CC={{ CC }} && ./configure -prefix=/usr/local && make install
   when:
-    - (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) ) and (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int >= 22)
+    - (ansible_distribution != "Ubuntu" or ansible_distribution == "Ubuntu" and ansible_distribution_major_version < "22") and (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) )
   tags: nasm
 
-- name: Running ./configure & make for nasm
-  shell: cd /tmp/nasm-2.13.03 && CC={{ CC }} ./configure -prefix=/usr/local && make install
+- name: Running ./configure & make for nasm ( Ubuntu 22+ x64 )
+  shell: cd /tmp/nasm-2.13.03 && CC={{ CC }} && ./configure -prefix=/usr/local && make install
+  environment:
+    CC: "{{ CC }}"
+    LIBRARY_PATH: /usr/lib/x86_64-linux-gnu
   when:
-    - (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) )
+    - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version >= "22" and ansible_architecture == "x86_64") and (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) )
   tags: nasm
 
 - name: Remove downloaded packages for nasm

From 337ec05d93dfa7315409454616014cfe2f0140a5 Mon Sep 17 00:00:00 2001
From: Scott Fryer <60462088+steelhead31@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:54:48 +0000
Subject: [PATCH 08/10] Fix Typo

Co-authored-by: Stewart X Addison <6487691+sxa@users.noreply.github.com>
---
 ansible/pbTestScripts/vmDestroy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/pbTestScripts/vmDestroy.sh b/ansible/pbTestScripts/vmDestroy.sh
index db09f90f53..794ba926dd 100755
--- a/ansible/pbTestScripts/vmDestroy.sh
+++ b/ansible/pbTestScripts/vmDestroy.sh
@@ -68,7 +68,7 @@ checkOS() {
   	"Windows2022" | "Win2022" | "W22" | "w22" )
 	                       osToDestroy="W2022";;
 	              "all" )
-                        osToDestroy="U16 U18 U20 U21 U22 6 C7 C8 D8 D10 FBSD12 Sol10 W2012 W2022" ;;
+                        osToDestroy="U16 U18 U20 U21 U22 C6 C7 C8 D8 D10 FBSD12 Sol10 W2012 W2022" ;;
 		"")
 			echo "No OS detected. Did you miss the '-o' option?" ; usage; exit 1;;
 		*) echo "$OS is not a currently supported OS" ; listOS; exit 1;

From e4cb7ddc3e738cd07c2c2749a26c66fa5aa751c2 Mon Sep 17 00:00:00 2001
From: Scott Fryer <60462088+steelhead31@users.noreply.github.com>
Date: Wed, 29 Nov 2023 17:06:15 +0000
Subject: [PATCH 09/10] Typo

Co-authored-by: Adam Farley <adfarley@redhat.com>
---
 ansible/pbTestScripts/vmDestroy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/pbTestScripts/vmDestroy.sh b/ansible/pbTestScripts/vmDestroy.sh
index 794ba926dd..214805c4c6 100755
--- a/ansible/pbTestScripts/vmDestroy.sh
+++ b/ansible/pbTestScripts/vmDestroy.sh
@@ -47,7 +47,7 @@ checkOS() {
                         osToDestroy="U20";;
                 "Ubuntu2104" | "U21" | "u21" )
                         osToDestroy="U21";;
-								"Ubuntu2204" | "U22" | "u22" )
+                "Ubuntu2204" | "U22" | "u22" )
 				                        osToDestroy="U22";;
                 "CentOS6" | "centos6" | "C6" | "c6" )
                         osToDestroy="C6" ;;

From 1382b699932fc7898c6083524d676b3acf1c21e6 Mon Sep 17 00:00:00 2001
From: Scott Fryer <60462088+steelhead31@users.noreply.github.com>
Date: Wed, 29 Nov 2023 17:06:27 +0000
Subject: [PATCH 10/10] Formatting

Co-authored-by: Adam Farley <adfarley@redhat.com>
---
 ansible/pbTestScripts/vmDestroy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/pbTestScripts/vmDestroy.sh b/ansible/pbTestScripts/vmDestroy.sh
index 214805c4c6..bc0762e511 100755
--- a/ansible/pbTestScripts/vmDestroy.sh
+++ b/ansible/pbTestScripts/vmDestroy.sh
@@ -48,7 +48,7 @@ checkOS() {
                 "Ubuntu2104" | "U21" | "u21" )
                         osToDestroy="U21";;
                 "Ubuntu2204" | "U22" | "u22" )
-				                        osToDestroy="U22";;
+                        osToDestroy="U22";;
                 "CentOS6" | "centos6" | "C6" | "c6" )
                         osToDestroy="C6" ;;
                 "CentOS7" | "centos7" | "C7" | "c7" )