From c652b7257361abf8714c4b28780fe0723e0c7428 Mon Sep 17 00:00:00 2001 From: Philippe Vanhaesendonck Date: Thu, 23 Nov 2023 19:39:14 +0100 Subject: [PATCH 1/4] build(olit): :construction_worker: Updates for OL8U9 / OL9U3 Signed-off-by: Philippe Vanhaesendonck --- oracle-linux-image-tools/distr/ol8-aarch64/env.properties | 4 ++-- oracle-linux-image-tools/distr/ol8-slim/env.properties | 2 +- oracle-linux-image-tools/distr/ol9-aarch64/env.properties | 4 ++-- oracle-linux-image-tools/distr/ol9-slim/env.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/oracle-linux-image-tools/distr/ol8-aarch64/env.properties b/oracle-linux-image-tools/distr/ol8-aarch64/env.properties index 5a6f4cd..931bd19 100644 --- a/oracle-linux-image-tools/distr/ol8-aarch64/env.properties +++ b/oracle-linux-image-tools/distr/ol8-aarch64/env.properties @@ -3,7 +3,7 @@ # env file. # Distribution name -DISTR_NAME="OL8U8_aarch64" +DISTR_NAME="OL8U9_aarch64" # Distribution release readonly ORACLE_RELEASE=8 @@ -15,7 +15,7 @@ SETUP_SWAP="yes" ROOT_FS="xfs" # Label of the ISO image -ISO_LABEL="OL-8-8-0-BaseOS-aarch64" +ISO_LABEL="OL-8-9-0-BaseOS-aarch64" # Boot command # Variables MUST be escaped as they are evaluated at build time. diff --git a/oracle-linux-image-tools/distr/ol8-slim/env.properties b/oracle-linux-image-tools/distr/ol8-slim/env.properties index a976069..2e4f63f 100644 --- a/oracle-linux-image-tools/distr/ol8-slim/env.properties +++ b/oracle-linux-image-tools/distr/ol8-slim/env.properties @@ -3,7 +3,7 @@ # env file. # Distribution name -DISTR_NAME="OL8U8_x86_64" +DISTR_NAME="OL8U9_x86_64" # Distribution release readonly ORACLE_RELEASE=8 diff --git a/oracle-linux-image-tools/distr/ol9-aarch64/env.properties b/oracle-linux-image-tools/distr/ol9-aarch64/env.properties index 2114a17..a842d74 100644 --- a/oracle-linux-image-tools/distr/ol9-aarch64/env.properties +++ b/oracle-linux-image-tools/distr/ol9-aarch64/env.properties @@ -3,7 +3,7 @@ # env file. # Distribution name -DISTR_NAME="OL9U2_aarch64" +DISTR_NAME="OL9U3_aarch64" # Distribution release readonly ORACLE_RELEASE=9 @@ -15,7 +15,7 @@ SETUP_SWAP="yes" ROOT_FS="xfs" # Label of the ISO image -ISO_LABEL="OL-9-2-0-BaseOS-aarch64" +ISO_LABEL="OL-9-3-0-BaseOS-aarch64" # Boot command # Variables MUST be escaped as they are evaluated at build time. diff --git a/oracle-linux-image-tools/distr/ol9-slim/env.properties b/oracle-linux-image-tools/distr/ol9-slim/env.properties index 5e861de..79cb075 100644 --- a/oracle-linux-image-tools/distr/ol9-slim/env.properties +++ b/oracle-linux-image-tools/distr/ol9-slim/env.properties @@ -3,7 +3,7 @@ # env file. # Distribution name -DISTR_NAME="OL9U2_x86_64" +DISTR_NAME="OL9U3_x86_64" # Distribution release readonly ORACLE_RELEASE=9 From 3dde80ab664eb486cb5e05564aa5126c024eccd4 Mon Sep 17 00:00:00 2001 From: Philippe Vanhaesendonck Date: Fri, 24 Nov 2023 10:26:54 +0100 Subject: [PATCH 2/4] feat(olit): :sparkles: VirtulBox 7.0 support Signed-off-by: Philippe Vanhaesendonck --- oracle-linux-image-tools/bin/build-image.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/oracle-linux-image-tools/bin/build-image.sh b/oracle-linux-image-tools/bin/build-image.sh index fe4dae5..0ebcf14 100755 --- a/oracle-linux-image-tools/bin/build-image.sh +++ b/oracle-linux-image-tools/bin/build-image.sh @@ -413,14 +413,20 @@ packer_conf() { local KS_CONFIG="http://{{ .HTTPIP }}:{{ .HTTPPort }}/${KS_FILE}" # shellcheck disable=SC2034 local CONSOLE="" - local modifyvm_console="" + local vbox_manage="" local qemu_serial_console="" if [[ "${SERIAL_CONSOLE,,}" = "yes" ]]; then # shellcheck disable=SC2034 CONSOLE=" console=tty0 console=ttyS0" - modifyvm_console='["modifyvm", "{{.Name}}", "--uart1", "0x3f8", 4, "--uartmode1", "file", "'"${WORKSPACE}/${VM_NAME}"'/serial-console.txt"],' + vbox_manage='["modifyvm", "{{.Name}}", "--uart1", "0x3f8", 4, "--uartmode1", "file", "'"${WORKSPACE}/${VM_NAME}"'/serial-console.txt"],' qemu_serial_console='[ "-serial", "file:'"${WORKSPACE}/${VM_NAME}"'/serial-console.txt" ]' fi + # VirtualBox 7 requires flag to allow guest to reach host + if common::is_vbox ; then + if [[ $(vboxmanage --version) =~ ^7\. ]]; then + vbox_manage+='["modifyvm", "{{.Name}}", "--nat-localhostreachable1", "on"],' + fi + fi cat > "${WORKSPACE}/${VM_NAME}.pkrvars.hcl" <<-EOF # Variables file for ${VM_NAME} @@ -437,7 +443,7 @@ packer_conf() { $(eval echo -e "\"$(printf ' \\"%s\\",\\n' "${BOOT_COMMAND[@]}")\"") ] shutdown_command = "${SHUTDOWN_CMD}" - vbox_manage = [ ${modifyvm_console} ] + vbox_manage = [ ${vbox_manage} ] x2apic = "${X2APIC}" ${QEMU_BINARY:+qemu_binary = ${q}$QEMU_BINARY${q}} qemu_args = [ ${qemu_serial_console} ] From ac7a80c9c5a9e8ff08001f32ce0a0ea1fecdf648 Mon Sep 17 00:00:00 2001 From: Philippe Vanhaesendonck Date: Fri, 24 Nov 2023 15:45:34 +0100 Subject: [PATCH 3/4] build(olit): :construction_worker: bump ssh timeout for slow systems Signed-off-by: Philippe Vanhaesendonck --- .../packer-template/virtualbox-x86-64.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oracle-linux-image-tools/packer-template/virtualbox-x86-64.pkr.hcl b/oracle-linux-image-tools/packer-template/virtualbox-x86-64.pkr.hcl index 3fab07b..0538a27 100644 --- a/oracle-linux-image-tools/packer-template/virtualbox-x86-64.pkr.hcl +++ b/oracle-linux-image-tools/packer-template/virtualbox-x86-64.pkr.hcl @@ -17,7 +17,7 @@ source "virtualbox-iso" "x86-64" { ssh_password = var.ssh_password ssh_private_key_file = var.ssh_private_key_file ssh_port = 22 - ssh_wait_timeout = "30m" + ssh_wait_timeout = "60m" http_directory = local.http_directory boot_wait = "20s" boot_command = var.boot_command From c6b8f061e132076712a1119ba9bc889060f577c8 Mon Sep 17 00:00:00 2001 From: Philippe Vanhaesendonck Date: Fri, 24 Nov 2023 17:06:21 +0100 Subject: [PATCH 4/4] docs(olit): :memo: readme update Signed-off-by: Philippe Vanhaesendonck --- oracle-linux-image-tools/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/oracle-linux-image-tools/README.md b/oracle-linux-image-tools/README.md index 8fe2285..e3ea61c 100755 --- a/oracle-linux-image-tools/README.md +++ b/oracle-linux-image-tools/README.md @@ -11,9 +11,9 @@ The tool currently supports: - Distributions: - Oracle Linux 7 update 9 -- Slim (x86_64) - - Oracle Linux 8 update 8 -- Slim (x86_64 and aarch64) + - Oracle Linux 8 update 9 -- Slim (x86_64 and aarch64) __Note__: for aarch64, only Generic, OCI and UTM clouds are supported - - Oracle Linux 9 update 2 -- Slim (x86_64 and aarch64) + - Oracle Linux 9 update 3 -- Slim (x86_64 and aarch64) __Note__: for aarch64, only Generic, OCI and UTM clouds are supported - Clouds: - Microsoft Azure cloud @@ -53,11 +53,11 @@ The build script requires a Linux environment and has been tested on Oracle Linu - Oracle Linux 7: `yum --enablerepo=ol7_kvm_utils group install "Virtualization Host"` or - `yum --enablerepo=ol7_developer install VirtualBox-6.1` + `yum --enablerepo=ol7_developer install VirtualBox-7.0` - Oracle Linux 8: `dnf module install virt` or - `dnf --enablerepo=ol8_developer install VirtualBox-6.1` + `dnf --enablerepo=ol8_developer install VirtualBox-7.0` 1. Install `kpartx` and `qemu-img` to manipulate the artifacts - Oracle Linux 7: `yum --enablerepo=ol7_kvm_utils install kpartx qemu-img`