Merge pull request #361 from smahima27/RE-16201

Add beaker-hostgenerator support for Fedora40-x86_64
voxpupuli · Apr 4, 2024 · 2f09d92 · 2f09d92
2 parents d7cf990 + 7935129
commit 2f09d92
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 1 deletion.
diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb
@@ -1087,7 +1087,7 @@ def generate_osinfo
       yield %w[aix73-POWER aix-7.3-power]
 
       # Fedora
-      (19..39).each do |release|
+      (19..40).each do |release|
         # 32 bit support was dropped in Fedora 31
         yield ["fedora#{release}-32", "fedora-#{release}-i386"] if release < 31
 

diff --git a/test/fixtures/generated/default/fedora40-64l b/test/fixtures/generated/default/fedora40-64l
@@ -0,0 +1,15 @@
+---
+arguments_string: fedora40-64l
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    fedora40-64-1:
+      platform: fedora-40-x86_64
+      hypervisor: vmpooler
+      template: fedora-40-x86_64
+      roles:
+      - agent
+      - classifier
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/multiplatform/fedora40-64l-windowsfips2012r2-64-fedora40-64f b/test/fixtures/generated/multiplatform/fedora40-64l-windowsfips2012r2-64-fedora40-64f
@@ -0,0 +1,30 @@
+---
+arguments_string: fedora40-64l-windowsfips2012r2-64-fedora40-64f
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    fedora40-64-1:
+      platform: fedora-40-x86_64
+      hypervisor: vmpooler
+      template: fedora-40-x86_64
+      roles:
+      - agent
+      - classifier
+    windowsfips2012r2-64-1:
+      platform: windows-2012r2-64
+      packaging_platform: windowsfips-2012-x64
+      ruby_arch: x64
+      template: win-2012r2-fips-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    fedora40-64-2:
+      platform: fedora-40-x86_64
+      hypervisor: vmpooler
+      template: fedora-40-x86_64
+      roles:
+      - agent
+      - frictionless
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/.../fixtures/generated/multiplatform/windowsfips2012r2-64d-fedora40-64-windowsfips2012r2-64c b/.../fixtures/generated/multiplatform/windowsfips2012r2-64d-fedora40-64-windowsfips2012r2-64c
@@ -0,0 +1,32 @@
+---
+arguments_string: windowsfips2012r2-64d-fedora40-64-windowsfips2012r2-64c
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windowsfips2012r2-64-1:
+      platform: windows-2012r2-64
+      packaging_platform: windowsfips-2012-x64
+      ruby_arch: x64
+      template: win-2012r2-fips-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - database
+    fedora40-64-1:
+      platform: fedora-40-x86_64
+      hypervisor: vmpooler
+      template: fedora-40-x86_64
+      roles:
+      - agent
+    windowsfips2012r2-64-2:
+      platform: windows-2012r2-64
+      packaging_platform: windowsfips-2012-x64
+      ruby_arch: x64
+      template: win-2012r2-fips-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - dashboard
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/osinfo-version-0/fedora40-64l b/test/fixtures/generated/osinfo-version-0/fedora40-64l
@@ -0,0 +1,15 @@
+---
+arguments_string: "--osinfo-version 0 fedora40-64l"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    fedora40-64-1:
+      platform: fedora-40-x86_64
+      hypervisor: vmpooler
+      template: fedora-40-x86_64
+      roles:
+      - agent
+      - classifier
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/osinfo-version-1/fedora40-64l b/test/fixtures/generated/osinfo-version-1/fedora40-64l
@@ -0,0 +1,15 @@
+---
+arguments_string: "--osinfo-version 1 fedora40-64l"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    fedora40-64-1:
+      platform: fedora-40-x86_64
+      hypervisor: vmpooler
+      template: fedora-40-x86_64
+      roles:
+      - agent
+      - classifier
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: