From b19617bfdfd317ec7fecf3127bea11fec220ea2a Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Tue, 13 Feb 2024 12:06:41 -0600 Subject: [PATCH] Add Ubuntu 24.04 support --- lib/beaker-hostgenerator/data.rb | 2 +- .../fixtures/generated/default/ubuntu2404-64c | 15 +++++++++ .../generated/default/ubuntu2404-AARCH64f | 14 +++++++++ .../generated/default/ubuntu2404-POWERd | 14 +++++++++ .../ubuntu2404-64c-vro73-64-ubuntu2404-64d | 28 +++++++++++++++++ ...u2404-AARCH64f-vro7-64-ubuntu2404-AARCH64l | 26 ++++++++++++++++ ...untu2404-POWERd-vro71-64-ubuntu2404-POWERc | 26 ++++++++++++++++ ...vro7-64aulcdfm-ubuntu2404-AARCH64-vro7-64a | 31 +++++++++++++++++++ ...vro71-64a-ubuntu2404-POWER-vro71-64aulcdfm | 31 +++++++++++++++++++ .../vro73-64u-ubuntu2404-64-vro73-64m | 28 +++++++++++++++++ .../generated/osinfo-version-0/ubuntu2404-64c | 15 +++++++++ .../osinfo-version-0/ubuntu2404-AARCH64f | 14 +++++++++ .../osinfo-version-0/ubuntu2404-POWERd | 14 +++++++++ .../generated/osinfo-version-1/ubuntu2404-64c | 15 +++++++++ .../osinfo-version-1/ubuntu2404-AARCH64f | 14 +++++++++ .../osinfo-version-1/ubuntu2404-POWERd | 14 +++++++++ 16 files changed, 300 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/generated/default/ubuntu2404-64c create mode 100644 test/fixtures/generated/default/ubuntu2404-AARCH64f create mode 100644 test/fixtures/generated/default/ubuntu2404-POWERd create mode 100644 test/fixtures/generated/multiplatform/ubuntu2404-64c-vro73-64-ubuntu2404-64d create mode 100644 test/fixtures/generated/multiplatform/ubuntu2404-AARCH64f-vro7-64-ubuntu2404-AARCH64l create mode 100644 test/fixtures/generated/multiplatform/ubuntu2404-POWERd-vro71-64-ubuntu2404-POWERc create mode 100644 test/fixtures/generated/multiplatform/vro7-64aulcdfm-ubuntu2404-AARCH64-vro7-64a create mode 100644 test/fixtures/generated/multiplatform/vro71-64a-ubuntu2404-POWER-vro71-64aulcdfm create mode 100644 test/fixtures/generated/multiplatform/vro73-64u-ubuntu2404-64-vro73-64m create mode 100644 test/fixtures/generated/osinfo-version-0/ubuntu2404-64c create mode 100644 test/fixtures/generated/osinfo-version-0/ubuntu2404-AARCH64f create mode 100644 test/fixtures/generated/osinfo-version-0/ubuntu2404-POWERd create mode 100644 test/fixtures/generated/osinfo-version-1/ubuntu2404-64c create mode 100644 test/fixtures/generated/osinfo-version-1/ubuntu2404-AARCH64f create mode 100644 test/fixtures/generated/osinfo-version-1/ubuntu2404-POWERd diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb index b0dc3c85..22b570ce 100644 --- a/lib/beaker-hostgenerator/data.rb +++ b/lib/beaker-hostgenerator/data.rb @@ -1088,7 +1088,7 @@ def generate_osinfo # Ubuntu # # Generate LTS platforms - (18..22).select(&:even?).each do |release| + (18..24).select(&:even?).each do |release| yield ["ubuntu#{release}04-64", "ubuntu-#{release}.04-amd64"] yield ["ubuntu#{release}04-POWER", "ubuntu-#{release}.04-ppc64el"] diff --git a/test/fixtures/generated/default/ubuntu2404-64c b/test/fixtures/generated/default/ubuntu2404-64c new file mode 100644 index 00000000..5db5c1af --- /dev/null +++ b/test/fixtures/generated/default/ubuntu2404-64c @@ -0,0 +1,15 @@ +--- +arguments_string: ubuntu2404-64c +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2404-64-1: + platform: ubuntu-24.04-amd64 + hypervisor: vmpooler + template: ubuntu-2404-x86_64 + roles: + - agent + - dashboard + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/default/ubuntu2404-AARCH64f b/test/fixtures/generated/default/ubuntu2404-AARCH64f new file mode 100644 index 00000000..297ce0ec --- /dev/null +++ b/test/fixtures/generated/default/ubuntu2404-AARCH64f @@ -0,0 +1,14 @@ +--- +arguments_string: ubuntu2404-AARCH64f +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2404-AARCH64-1: + platform: ubuntu-24.04-aarch64 + hypervisor: vmpooler + roles: + - agent + - frictionless + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/default/ubuntu2404-POWERd b/test/fixtures/generated/default/ubuntu2404-POWERd new file mode 100644 index 00000000..d7a5895e --- /dev/null +++ b/test/fixtures/generated/default/ubuntu2404-POWERd @@ -0,0 +1,14 @@ +--- +arguments_string: ubuntu2404-POWERd +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2404-POWER-1: + platform: ubuntu-24.04-ppc64el + hypervisor: vmpooler + roles: + - agent + - database + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/multiplatform/ubuntu2404-64c-vro73-64-ubuntu2404-64d b/test/fixtures/generated/multiplatform/ubuntu2404-64c-vro73-64-ubuntu2404-64d new file mode 100644 index 00000000..5cccc2a7 --- /dev/null +++ b/test/fixtures/generated/multiplatform/ubuntu2404-64c-vro73-64-ubuntu2404-64d @@ -0,0 +1,28 @@ +--- +arguments_string: ubuntu2404-64c-vro73-64-ubuntu2404-64d +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2404-64-1: + platform: ubuntu-24.04-amd64 + hypervisor: vmpooler + template: ubuntu-2404-x86_64 + roles: + - agent + - dashboard + vro73-64-1: + platform: sles-11-x86_64 + template: vro-73-x86_64 + hypervisor: vmpooler + roles: + - agent + ubuntu2404-64-2: + platform: ubuntu-24.04-amd64 + hypervisor: vmpooler + template: ubuntu-2404-x86_64 + roles: + - agent + - database + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/multiplatform/ubuntu2404-AARCH64f-vro7-64-ubuntu2404-AARCH64l b/test/fixtures/generated/multiplatform/ubuntu2404-AARCH64f-vro7-64-ubuntu2404-AARCH64l new file mode 100644 index 00000000..1f6e4e3b --- /dev/null +++ b/test/fixtures/generated/multiplatform/ubuntu2404-AARCH64f-vro7-64-ubuntu2404-AARCH64l @@ -0,0 +1,26 @@ +--- +arguments_string: ubuntu2404-AARCH64f-vro7-64-ubuntu2404-AARCH64l +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2404-AARCH64-1: + platform: ubuntu-24.04-aarch64 + hypervisor: vmpooler + roles: + - agent + - frictionless + vro7-64-1: + platform: sles-11-x86_64 + template: vro-7-x86_64 + hypervisor: vmpooler + roles: + - agent + ubuntu2404-AARCH64-2: + platform: ubuntu-24.04-aarch64 + hypervisor: vmpooler + roles: + - agent + - classifier + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/multiplatform/ubuntu2404-POWERd-vro71-64-ubuntu2404-POWERc b/test/fixtures/generated/multiplatform/ubuntu2404-POWERd-vro71-64-ubuntu2404-POWERc new file mode 100644 index 00000000..9f4ebf1c --- /dev/null +++ b/test/fixtures/generated/multiplatform/ubuntu2404-POWERd-vro71-64-ubuntu2404-POWERc @@ -0,0 +1,26 @@ +--- +arguments_string: ubuntu2404-POWERd-vro71-64-ubuntu2404-POWERc +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2404-POWER-1: + platform: ubuntu-24.04-ppc64el + hypervisor: vmpooler + roles: + - agent + - database + vro71-64-1: + platform: sles-11-x86_64 + template: vro-71-x86_64 + hypervisor: vmpooler + roles: + - agent + ubuntu2404-POWER-2: + platform: ubuntu-24.04-ppc64el + hypervisor: vmpooler + roles: + - agent + - dashboard + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/multiplatform/vro7-64aulcdfm-ubuntu2404-AARCH64-vro7-64a b/test/fixtures/generated/multiplatform/vro7-64aulcdfm-ubuntu2404-AARCH64-vro7-64a new file mode 100644 index 00000000..d81fd1cf --- /dev/null +++ b/test/fixtures/generated/multiplatform/vro7-64aulcdfm-ubuntu2404-AARCH64-vro7-64a @@ -0,0 +1,31 @@ +--- +arguments_string: vro7-64aulcdfm-ubuntu2404-AARCH64-vro7-64a +environment_variables: {} +expected_hash: + HOSTS: + vro7-64-1: + platform: sles-11-x86_64 + template: vro-7-x86_64 + hypervisor: vmpooler + roles: + - agent + - ca + - classifier + - dashboard + - database + - frictionless + - master + ubuntu2404-AARCH64-1: + platform: ubuntu-24.04-aarch64 + hypervisor: vmpooler + roles: + - agent + vro7-64-2: + platform: sles-11-x86_64 + template: vro-7-x86_64 + hypervisor: vmpooler + roles: + - agent + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/multiplatform/vro71-64a-ubuntu2404-POWER-vro71-64aulcdfm b/test/fixtures/generated/multiplatform/vro71-64a-ubuntu2404-POWER-vro71-64aulcdfm new file mode 100644 index 00000000..33f56b0a --- /dev/null +++ b/test/fixtures/generated/multiplatform/vro71-64a-ubuntu2404-POWER-vro71-64aulcdfm @@ -0,0 +1,31 @@ +--- +arguments_string: vro71-64a-ubuntu2404-POWER-vro71-64aulcdfm +environment_variables: {} +expected_hash: + HOSTS: + vro71-64-1: + platform: sles-11-x86_64 + template: vro-71-x86_64 + hypervisor: vmpooler + roles: + - agent + ubuntu2404-POWER-1: + platform: ubuntu-24.04-ppc64el + hypervisor: vmpooler + roles: + - agent + vro71-64-2: + platform: sles-11-x86_64 + template: vro-71-x86_64 + hypervisor: vmpooler + roles: + - agent + - ca + - classifier + - dashboard + - database + - frictionless + - master + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/multiplatform/vro73-64u-ubuntu2404-64-vro73-64m b/test/fixtures/generated/multiplatform/vro73-64u-ubuntu2404-64-vro73-64m new file mode 100644 index 00000000..baa03443 --- /dev/null +++ b/test/fixtures/generated/multiplatform/vro73-64u-ubuntu2404-64-vro73-64m @@ -0,0 +1,28 @@ +--- +arguments_string: vro73-64u-ubuntu2404-64-vro73-64m +environment_variables: {} +expected_hash: + HOSTS: + vro73-64-1: + platform: sles-11-x86_64 + template: vro-73-x86_64 + hypervisor: vmpooler + roles: + - agent + - ca + ubuntu2404-64-1: + platform: ubuntu-24.04-amd64 + hypervisor: vmpooler + template: ubuntu-2404-x86_64 + roles: + - agent + vro73-64-2: + platform: sles-11-x86_64 + template: vro-73-x86_64 + hypervisor: vmpooler + roles: + - agent + - master + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/osinfo-version-0/ubuntu2404-64c b/test/fixtures/generated/osinfo-version-0/ubuntu2404-64c new file mode 100644 index 00000000..90a8eeb3 --- /dev/null +++ b/test/fixtures/generated/osinfo-version-0/ubuntu2404-64c @@ -0,0 +1,15 @@ +--- +arguments_string: "--osinfo-version 0 ubuntu2404-64c" +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2404-64-1: + platform: ubuntu-24.04-amd64 + hypervisor: vmpooler + template: ubuntu-2404-x86_64 + roles: + - agent + - dashboard + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/osinfo-version-0/ubuntu2404-AARCH64f b/test/fixtures/generated/osinfo-version-0/ubuntu2404-AARCH64f new file mode 100644 index 00000000..a1154f83 --- /dev/null +++ b/test/fixtures/generated/osinfo-version-0/ubuntu2404-AARCH64f @@ -0,0 +1,14 @@ +--- +arguments_string: "--osinfo-version 0 ubuntu2404-AARCH64f" +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2404-AARCH64-1: + platform: ubuntu-24.04-aarch64 + hypervisor: vmpooler + roles: + - agent + - frictionless + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/osinfo-version-0/ubuntu2404-POWERd b/test/fixtures/generated/osinfo-version-0/ubuntu2404-POWERd new file mode 100644 index 00000000..0599747f --- /dev/null +++ b/test/fixtures/generated/osinfo-version-0/ubuntu2404-POWERd @@ -0,0 +1,14 @@ +--- +arguments_string: "--osinfo-version 0 ubuntu2404-POWERd" +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2404-POWER-1: + platform: ubuntu-24.04-ppc64el + hypervisor: vmpooler + roles: + - agent + - database + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/osinfo-version-1/ubuntu2404-64c b/test/fixtures/generated/osinfo-version-1/ubuntu2404-64c new file mode 100644 index 00000000..9575a226 --- /dev/null +++ b/test/fixtures/generated/osinfo-version-1/ubuntu2404-64c @@ -0,0 +1,15 @@ +--- +arguments_string: "--osinfo-version 1 ubuntu2404-64c" +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2404-64-1: + platform: ubuntu-24.04-amd64 + hypervisor: vmpooler + template: ubuntu-2404-x86_64 + roles: + - agent + - dashboard + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/osinfo-version-1/ubuntu2404-AARCH64f b/test/fixtures/generated/osinfo-version-1/ubuntu2404-AARCH64f new file mode 100644 index 00000000..16a6fd31 --- /dev/null +++ b/test/fixtures/generated/osinfo-version-1/ubuntu2404-AARCH64f @@ -0,0 +1,14 @@ +--- +arguments_string: "--osinfo-version 1 ubuntu2404-AARCH64f" +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2404-AARCH64-1: + platform: ubuntu-24.04-aarch64 + hypervisor: vmpooler + roles: + - agent + - frictionless + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/osinfo-version-1/ubuntu2404-POWERd b/test/fixtures/generated/osinfo-version-1/ubuntu2404-POWERd new file mode 100644 index 00000000..57209c7d --- /dev/null +++ b/test/fixtures/generated/osinfo-version-1/ubuntu2404-POWERd @@ -0,0 +1,14 @@ +--- +arguments_string: "--osinfo-version 1 ubuntu2404-POWERd" +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2404-POWER-1: + platform: ubuntu-24.04-ppc64el + hypervisor: vmpooler + roles: + - agent + - database + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: