From 74cb14eb517325e4ef530ba4d06063e655bea1f3 Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Thu, 21 Sep 2023 14:57:10 -0400 Subject: [PATCH 1/3] Bump allowed Fedora up to 38 --- lib/beaker-hostgenerator/data.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb index d7df57f3..8ab6dbe6 100644 --- a/lib/beaker-hostgenerator/data.rb +++ b/lib/beaker-hostgenerator/data.rb @@ -1067,7 +1067,7 @@ def get_platform_info(bhg_version, platform, hypervisor) # @api private def generate_osinfo # Fedora - (19..36).each do |release| + (19..38).each do |release| # 32 bit support was dropped in Fedora 31 yield ["fedora#{release}-32", "fedora-#{release}-i386"] if release < 31 From 5339ab6810fbebbdcbcf66c087c816a1cd3acfdc Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Thu, 21 Sep 2023 15:00:49 -0400 Subject: [PATCH 2/3] Add fedora37-64 fixtures --- test/fixtures/generated/default/fedora37-64m | 15 ++++++++ ...ora37-64m-windows2012r2_ja-64-fedora37-64u | 31 +++++++++++++++ ...64a-fedora37-64-windows2012r2_ja-64aulcdfm | 38 +++++++++++++++++++ .../generated/osinfo-version-0/fedora37-64m | 15 ++++++++ .../generated/osinfo-version-1/fedora37-64m | 15 ++++++++ 5 files changed, 114 insertions(+) create mode 100644 test/fixtures/generated/default/fedora37-64m create mode 100644 test/fixtures/generated/multiplatform/fedora37-64m-windows2012r2_ja-64-fedora37-64u create mode 100644 test/fixtures/generated/multiplatform/windows2012r2_ja-64a-fedora37-64-windows2012r2_ja-64aulcdfm create mode 100644 test/fixtures/generated/osinfo-version-0/fedora37-64m create mode 100644 test/fixtures/generated/osinfo-version-1/fedora37-64m diff --git a/test/fixtures/generated/default/fedora37-64m b/test/fixtures/generated/default/fedora37-64m new file mode 100644 index 00000000..675fd75a --- /dev/null +++ b/test/fixtures/generated/default/fedora37-64m @@ -0,0 +1,15 @@ +--- +arguments_string: fedora37-64m +environment_variables: {} +expected_hash: + HOSTS: + fedora37-64-1: + platform: fedora-37-x86_64 + hypervisor: vmpooler + template: fedora-37-x86_64 + roles: + - agent + - master + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/multiplatform/fedora37-64m-windows2012r2_ja-64-fedora37-64u b/test/fixtures/generated/multiplatform/fedora37-64m-windows2012r2_ja-64-fedora37-64u new file mode 100644 index 00000000..f33c9a09 --- /dev/null +++ b/test/fixtures/generated/multiplatform/fedora37-64m-windows2012r2_ja-64-fedora37-64u @@ -0,0 +1,31 @@ +--- +arguments_string: fedora37-64m-windows2012r2_ja-64-fedora37-64u +environment_variables: {} +expected_hash: + HOSTS: + fedora37-64-1: + platform: fedora-37-x86_64 + hypervisor: vmpooler + template: fedora-37-x86_64 + roles: + - agent + - master + windows2012r2_ja-64-1: + platform: windows-2012r2-64 + packaging_platform: windows-2012-x64 + ruby_arch: x64 + template: win-2012r2-ja-x86_64 + locale: ja + hypervisor: vmpooler + roles: + - agent + fedora37-64-2: + platform: fedora-37-x86_64 + hypervisor: vmpooler + template: fedora-37-x86_64 + roles: + - agent + - ca + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/multiplatform/windows2012r2_ja-64a-fedora37-64-windows2012r2_ja-64aulcdfm b/test/fixtures/generated/multiplatform/windows2012r2_ja-64a-fedora37-64-windows2012r2_ja-64aulcdfm new file mode 100644 index 00000000..b3192baa --- /dev/null +++ b/test/fixtures/generated/multiplatform/windows2012r2_ja-64a-fedora37-64-windows2012r2_ja-64aulcdfm @@ -0,0 +1,38 @@ +--- +arguments_string: windows2012r2_ja-64a-fedora37-64-windows2012r2_ja-64aulcdfm +environment_variables: {} +expected_hash: + HOSTS: + windows2012r2_ja-64-1: + platform: windows-2012r2-64 + packaging_platform: windows-2012-x64 + ruby_arch: x64 + template: win-2012r2-ja-x86_64 + locale: ja + hypervisor: vmpooler + roles: + - agent + fedora37-64-1: + platform: fedora-37-x86_64 + hypervisor: vmpooler + template: fedora-37-x86_64 + roles: + - agent + windows2012r2_ja-64-2: + platform: windows-2012r2-64 + packaging_platform: windows-2012-x64 + ruby_arch: x64 + template: win-2012r2-ja-x86_64 + locale: ja + 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/osinfo-version-0/fedora37-64m b/test/fixtures/generated/osinfo-version-0/fedora37-64m new file mode 100644 index 00000000..a8977ef6 --- /dev/null +++ b/test/fixtures/generated/osinfo-version-0/fedora37-64m @@ -0,0 +1,15 @@ +--- +arguments_string: "--osinfo-version 0 fedora37-64m" +environment_variables: {} +expected_hash: + HOSTS: + fedora37-64-1: + platform: fedora-37-x86_64 + hypervisor: vmpooler + template: fedora-37-x86_64 + roles: + - agent + - master + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/osinfo-version-1/fedora37-64m b/test/fixtures/generated/osinfo-version-1/fedora37-64m new file mode 100644 index 00000000..a8067450 --- /dev/null +++ b/test/fixtures/generated/osinfo-version-1/fedora37-64m @@ -0,0 +1,15 @@ +--- +arguments_string: "--osinfo-version 1 fedora37-64m" +environment_variables: {} +expected_hash: + HOSTS: + fedora37-64-1: + platform: fedora-37-x86_64 + hypervisor: vmpooler + template: fedora-37-x86_64 + roles: + - agent + - master + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: From 58c5d613ad12e87ce9187f0ca677770d2eacec82 Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Thu, 21 Sep 2023 15:01:51 -0400 Subject: [PATCH 3/3] Add fedora38-64 fixtures --- .../generated/default/fedora38-64aulcdfm | 20 +++++++++++ ...aulcdfm-windows2012r2_wmf5-64-fedora38-64a | 34 ++++++++++++++++++ ...aulcdfm-fedora38-64-windows2012r2_wmf5-64a | 36 +++++++++++++++++++ .../osinfo-version-0/fedora38-64aulcdfm | 20 +++++++++++ .../osinfo-version-1/fedora38-64aulcdfm | 20 +++++++++++ 5 files changed, 130 insertions(+) create mode 100644 test/fixtures/generated/default/fedora38-64aulcdfm create mode 100644 test/fixtures/generated/multiplatform/fedora38-64aulcdfm-windows2012r2_wmf5-64-fedora38-64a create mode 100644 test/fixtures/generated/multiplatform/windows2012r2_wmf5-64aulcdfm-fedora38-64-windows2012r2_wmf5-64a create mode 100644 test/fixtures/generated/osinfo-version-0/fedora38-64aulcdfm create mode 100644 test/fixtures/generated/osinfo-version-1/fedora38-64aulcdfm diff --git a/test/fixtures/generated/default/fedora38-64aulcdfm b/test/fixtures/generated/default/fedora38-64aulcdfm new file mode 100644 index 00000000..525ae588 --- /dev/null +++ b/test/fixtures/generated/default/fedora38-64aulcdfm @@ -0,0 +1,20 @@ +--- +arguments_string: fedora38-64aulcdfm +environment_variables: {} +expected_hash: + HOSTS: + fedora38-64-1: + platform: fedora-38-x86_64 + hypervisor: vmpooler + template: fedora-38-x86_64 + 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/fedora38-64aulcdfm-windows2012r2_wmf5-64-fedora38-64a b/test/fixtures/generated/multiplatform/fedora38-64aulcdfm-windows2012r2_wmf5-64-fedora38-64a new file mode 100644 index 00000000..362a9751 --- /dev/null +++ b/test/fixtures/generated/multiplatform/fedora38-64aulcdfm-windows2012r2_wmf5-64-fedora38-64a @@ -0,0 +1,34 @@ +--- +arguments_string: fedora38-64aulcdfm-windows2012r2_wmf5-64-fedora38-64a +environment_variables: {} +expected_hash: + HOSTS: + fedora38-64-1: + platform: fedora-38-x86_64 + hypervisor: vmpooler + template: fedora-38-x86_64 + roles: + - agent + - ca + - classifier + - dashboard + - database + - frictionless + - master + windows2012r2_wmf5-64-1: + platform: windows-2012r2-64 + packaging_platform: windows-2012-x64 + ruby_arch: x64 + template: win-2012r2-wmf5-x86_64 + hypervisor: vmpooler + roles: + - agent + fedora38-64-2: + platform: fedora-38-x86_64 + hypervisor: vmpooler + template: fedora-38-x86_64 + roles: + - agent + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/multiplatform/windows2012r2_wmf5-64aulcdfm-fedora38-64-windows2012r2_wmf5-64a b/test/fixtures/generated/multiplatform/windows2012r2_wmf5-64aulcdfm-fedora38-64-windows2012r2_wmf5-64a new file mode 100644 index 00000000..f776a586 --- /dev/null +++ b/test/fixtures/generated/multiplatform/windows2012r2_wmf5-64aulcdfm-fedora38-64-windows2012r2_wmf5-64a @@ -0,0 +1,36 @@ +--- +arguments_string: windows2012r2_wmf5-64aulcdfm-fedora38-64-windows2012r2_wmf5-64a +environment_variables: {} +expected_hash: + HOSTS: + windows2012r2_wmf5-64-1: + platform: windows-2012r2-64 + packaging_platform: windows-2012-x64 + ruby_arch: x64 + template: win-2012r2-wmf5-x86_64 + hypervisor: vmpooler + roles: + - agent + - ca + - classifier + - dashboard + - database + - frictionless + - master + fedora38-64-1: + platform: fedora-38-x86_64 + hypervisor: vmpooler + template: fedora-38-x86_64 + roles: + - agent + windows2012r2_wmf5-64-2: + platform: windows-2012r2-64 + packaging_platform: windows-2012-x64 + ruby_arch: x64 + template: win-2012r2-wmf5-x86_64 + hypervisor: vmpooler + roles: + - agent + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: diff --git a/test/fixtures/generated/osinfo-version-0/fedora38-64aulcdfm b/test/fixtures/generated/osinfo-version-0/fedora38-64aulcdfm new file mode 100644 index 00000000..1d862a87 --- /dev/null +++ b/test/fixtures/generated/osinfo-version-0/fedora38-64aulcdfm @@ -0,0 +1,20 @@ +--- +arguments_string: "--osinfo-version 0 fedora38-64aulcdfm" +environment_variables: {} +expected_hash: + HOSTS: + fedora38-64-1: + platform: fedora-38-x86_64 + hypervisor: vmpooler + template: fedora-38-x86_64 + 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/osinfo-version-1/fedora38-64aulcdfm b/test/fixtures/generated/osinfo-version-1/fedora38-64aulcdfm new file mode 100644 index 00000000..06d1ea0b --- /dev/null +++ b/test/fixtures/generated/osinfo-version-1/fedora38-64aulcdfm @@ -0,0 +1,20 @@ +--- +arguments_string: "--osinfo-version 1 fedora38-64aulcdfm" +environment_variables: {} +expected_hash: + HOSTS: + fedora38-64-1: + platform: fedora-38-x86_64 + hypervisor: vmpooler + template: fedora-38-x86_64 + roles: + - agent + - ca + - classifier + - dashboard + - database + - frictionless + - master + CONFIG: + pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ +expected_exception: