From 828c8c0a2657159a451aa593b23c3527479d30ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Fri, 29 Apr 2022 11:56:40 +0200 Subject: [PATCH] Add Ubuntu 22.04 --- lib/beaker-hostgenerator/data.rb | 2 +- .../fixtures/generated/default/ubuntu2204-64l | 17 ++++++++++ .../generated/default/ubuntu2204-AARCH64d | 16 ++++++++++ .../generated/default/ubuntu2204-POWERc | 16 ++++++++++ ...untu2204-64l-windows2008-64-ubuntu2204-64f | 32 +++++++++++++++++++ ...2204-AARCH64d-vro73-64-ubuntu2204-AARCH64c | 28 ++++++++++++++++ ...untu2204-POWERc-vro74-64-ubuntu2204-POWERd | 28 ++++++++++++++++ .../generated/osinfo-version-0/ubuntu2204-64l | 17 ++++++++++ .../osinfo-version-0/ubuntu2204-AARCH64d | 16 ++++++++++ .../osinfo-version-0/ubuntu2204-POWERc | 16 ++++++++++ .../generated/osinfo-version-1/ubuntu2204-64l | 17 ++++++++++ .../osinfo-version-1/ubuntu2204-AARCH64d | 16 ++++++++++ .../osinfo-version-1/ubuntu2204-POWERc | 16 ++++++++++ 13 files changed, 236 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/generated/default/ubuntu2204-64l create mode 100644 test/fixtures/generated/default/ubuntu2204-AARCH64d create mode 100644 test/fixtures/generated/default/ubuntu2204-POWERc create mode 100644 test/fixtures/generated/multiplatform/ubuntu2204-64l-windows2008-64-ubuntu2204-64f create mode 100644 test/fixtures/generated/multiplatform/ubuntu2204-AARCH64d-vro73-64-ubuntu2204-AARCH64c create mode 100644 test/fixtures/generated/multiplatform/ubuntu2204-POWERc-vro74-64-ubuntu2204-POWERd create mode 100644 test/fixtures/generated/osinfo-version-0/ubuntu2204-64l create mode 100644 test/fixtures/generated/osinfo-version-0/ubuntu2204-AARCH64d create mode 100644 test/fixtures/generated/osinfo-version-0/ubuntu2204-POWERc create mode 100644 test/fixtures/generated/osinfo-version-1/ubuntu2204-64l create mode 100644 test/fixtures/generated/osinfo-version-1/ubuntu2204-AARCH64d create mode 100644 test/fixtures/generated/osinfo-version-1/ubuntu2204-POWERc diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb index 10f73922..886d5b00 100644 --- a/lib/beaker-hostgenerator/data.rb +++ b/lib/beaker-hostgenerator/data.rb @@ -103,7 +103,7 @@ def osinfo # Ubuntu # # Generate LTS platforms - (14..20).select(&:even?).each do |release| + (14..22).select(&:even?).each do |release| # 32 bit support was dropped in Ubuntu 18.04 if release < 18 result["ubuntu#{release}04-32"] = { diff --git a/test/fixtures/generated/default/ubuntu2204-64l b/test/fixtures/generated/default/ubuntu2204-64l new file mode 100644 index 00000000..b2ceb66a --- /dev/null +++ b/test/fixtures/generated/default/ubuntu2204-64l @@ -0,0 +1,17 @@ +--- +arguments_string: ubuntu2204-64l +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2204-64-1: + platform: ubuntu-22.04-amd64 + hypervisor: vmpooler + template: ubuntu-2204-x86_64 + roles: + - agent + - classifier + CONFIG: + nfs_server: none + consoleport: 443 + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/default/ubuntu2204-AARCH64d b/test/fixtures/generated/default/ubuntu2204-AARCH64d new file mode 100644 index 00000000..ae0db170 --- /dev/null +++ b/test/fixtures/generated/default/ubuntu2204-AARCH64d @@ -0,0 +1,16 @@ +--- +arguments_string: ubuntu2204-AARCH64d +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2204-AARCH64-1: + platform: ubuntu-22.04-aarch64 + hypervisor: vmpooler + roles: + - agent + - database + CONFIG: + nfs_server: none + consoleport: 443 + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/default/ubuntu2204-POWERc b/test/fixtures/generated/default/ubuntu2204-POWERc new file mode 100644 index 00000000..7d77246c --- /dev/null +++ b/test/fixtures/generated/default/ubuntu2204-POWERc @@ -0,0 +1,16 @@ +--- +arguments_string: ubuntu2204-POWERc +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2204-POWER-1: + platform: ubuntu-22.04-ppc64el + hypervisor: vmpooler + roles: + - agent + - dashboard + CONFIG: + nfs_server: none + consoleport: 443 + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/multiplatform/ubuntu2204-64l-windows2008-64-ubuntu2204-64f b/test/fixtures/generated/multiplatform/ubuntu2204-64l-windows2008-64-ubuntu2204-64f new file mode 100644 index 00000000..17837837 --- /dev/null +++ b/test/fixtures/generated/multiplatform/ubuntu2204-64l-windows2008-64-ubuntu2204-64f @@ -0,0 +1,32 @@ +--- +arguments_string: ubuntu2204-64l-windows2008-64-ubuntu2204-64f +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2204-64-1: + platform: ubuntu-22.04-amd64 + hypervisor: vmpooler + template: ubuntu-2204-x86_64 + roles: + - agent + - classifier + windows2008-64-1: + platform: windows-2008-64 + packaging_platform: windows-2012-x64 + ruby_arch: x64 + template: win-2008-x86_64 + hypervisor: vmpooler + roles: + - agent + ubuntu2204-64-2: + platform: ubuntu-22.04-amd64 + hypervisor: vmpooler + template: ubuntu-2204-x86_64 + roles: + - agent + - frictionless + CONFIG: + nfs_server: none + consoleport: 443 + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/multiplatform/ubuntu2204-AARCH64d-vro73-64-ubuntu2204-AARCH64c b/test/fixtures/generated/multiplatform/ubuntu2204-AARCH64d-vro73-64-ubuntu2204-AARCH64c new file mode 100644 index 00000000..1c1ae033 --- /dev/null +++ b/test/fixtures/generated/multiplatform/ubuntu2204-AARCH64d-vro73-64-ubuntu2204-AARCH64c @@ -0,0 +1,28 @@ +--- +arguments_string: ubuntu2204-AARCH64d-vro73-64-ubuntu2204-AARCH64c +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2204-AARCH64-1: + platform: ubuntu-22.04-aarch64 + hypervisor: vmpooler + roles: + - agent + - database + vro73-64-1: + platform: sles-11-x86_64 + template: vro-73-x86_64 + hypervisor: vmpooler + roles: + - agent + ubuntu2204-AARCH64-2: + platform: ubuntu-22.04-aarch64 + hypervisor: vmpooler + roles: + - agent + - dashboard + CONFIG: + nfs_server: none + consoleport: 443 + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/multiplatform/ubuntu2204-POWERc-vro74-64-ubuntu2204-POWERd b/test/fixtures/generated/multiplatform/ubuntu2204-POWERc-vro74-64-ubuntu2204-POWERd new file mode 100644 index 00000000..f8391bdf --- /dev/null +++ b/test/fixtures/generated/multiplatform/ubuntu2204-POWERc-vro74-64-ubuntu2204-POWERd @@ -0,0 +1,28 @@ +--- +arguments_string: ubuntu2204-POWERc-vro74-64-ubuntu2204-POWERd +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2204-POWER-1: + platform: ubuntu-22.04-ppc64el + hypervisor: vmpooler + roles: + - agent + - dashboard + vro74-64-1: + platform: sles-11-x86_64 + template: vro-74-x86_64 + hypervisor: vmpooler + roles: + - agent + ubuntu2204-POWER-2: + platform: ubuntu-22.04-ppc64el + hypervisor: vmpooler + roles: + - agent + - database + CONFIG: + nfs_server: none + consoleport: 443 + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/osinfo-version-0/ubuntu2204-64l b/test/fixtures/generated/osinfo-version-0/ubuntu2204-64l new file mode 100644 index 00000000..4fa50330 --- /dev/null +++ b/test/fixtures/generated/osinfo-version-0/ubuntu2204-64l @@ -0,0 +1,17 @@ +--- +arguments_string: "--osinfo-version 0 ubuntu2204-64l" +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2204-64-1: + platform: ubuntu-22.04-amd64 + hypervisor: vmpooler + template: ubuntu-2204-x86_64 + roles: + - agent + - classifier + CONFIG: + nfs_server: none + consoleport: 443 + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/osinfo-version-0/ubuntu2204-AARCH64d b/test/fixtures/generated/osinfo-version-0/ubuntu2204-AARCH64d new file mode 100644 index 00000000..87e875d2 --- /dev/null +++ b/test/fixtures/generated/osinfo-version-0/ubuntu2204-AARCH64d @@ -0,0 +1,16 @@ +--- +arguments_string: "--osinfo-version 0 ubuntu2204-AARCH64d" +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2204-AARCH64-1: + platform: ubuntu-22.04-aarch64 + hypervisor: vmpooler + roles: + - agent + - database + CONFIG: + nfs_server: none + consoleport: 443 + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/osinfo-version-0/ubuntu2204-POWERc b/test/fixtures/generated/osinfo-version-0/ubuntu2204-POWERc new file mode 100644 index 00000000..8f81b172 --- /dev/null +++ b/test/fixtures/generated/osinfo-version-0/ubuntu2204-POWERc @@ -0,0 +1,16 @@ +--- +arguments_string: "--osinfo-version 0 ubuntu2204-POWERc" +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2204-POWER-1: + platform: ubuntu-22.04-ppc64el + hypervisor: vmpooler + roles: + - agent + - dashboard + CONFIG: + nfs_server: none + consoleport: 443 + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/osinfo-version-1/ubuntu2204-64l b/test/fixtures/generated/osinfo-version-1/ubuntu2204-64l new file mode 100644 index 00000000..0e886e5c --- /dev/null +++ b/test/fixtures/generated/osinfo-version-1/ubuntu2204-64l @@ -0,0 +1,17 @@ +--- +arguments_string: "--osinfo-version 1 ubuntu2204-64l" +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2204-64-1: + platform: ubuntu-22.04-amd64 + hypervisor: vmpooler + template: ubuntu-2204-x86_64 + roles: + - agent + - classifier + CONFIG: + nfs_server: none + consoleport: 443 + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/osinfo-version-1/ubuntu2204-AARCH64d b/test/fixtures/generated/osinfo-version-1/ubuntu2204-AARCH64d new file mode 100644 index 00000000..0c30b357 --- /dev/null +++ b/test/fixtures/generated/osinfo-version-1/ubuntu2204-AARCH64d @@ -0,0 +1,16 @@ +--- +arguments_string: "--osinfo-version 1 ubuntu2204-AARCH64d" +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2204-AARCH64-1: + platform: ubuntu-22.04-aarch64 + hypervisor: vmpooler + roles: + - agent + - database + CONFIG: + nfs_server: none + consoleport: 443 + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/osinfo-version-1/ubuntu2204-POWERc b/test/fixtures/generated/osinfo-version-1/ubuntu2204-POWERc new file mode 100644 index 00000000..7cba5f22 --- /dev/null +++ b/test/fixtures/generated/osinfo-version-1/ubuntu2204-POWERc @@ -0,0 +1,16 @@ +--- +arguments_string: "--osinfo-version 1 ubuntu2204-POWERc" +environment_variables: {} +expected_hash: + HOSTS: + ubuntu2204-POWER-1: + platform: ubuntu-22.04-ppc64el + hypervisor: vmpooler + roles: + - agent + - dashboard + CONFIG: + nfs_server: none + consoleport: 443 + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: