Merge pull request #185 from Dorin-Pleava/IMAGES-1195

(IMAGES-1195) Add support for Fedora 32
voxpupuli · Jun 12, 2020 · 9aac7cc · 9aac7cc
2 parents 67c3e4d + 03a8792
commit 9aac7cc
Show file tree

Hide file tree

Showing 6 changed files with 170 additions and 0 deletions.
diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb
@@ -772,6 +772,15 @@ def osinfo
             'template' => 'fedora-31-x86_64'
           }
         },
+        'fedora32-64' => {
+          :general => {
+            'platform'           => 'fedora-32-x86_64',
+            'packaging_platform' => 'fedora-32-x86_64'
+          },
+          :vmpooler => {
+            'template' => 'fedora-32-x86_64'
+          }
+        },
         'huaweios6-POWER' => {
           :general => {
             'platform' => 'huaweios-6-powerpc'

diff --git a/test/fixtures/generated/default/fedora32-64a b/test/fixtures/generated/default/fedora32-64a
@@ -0,0 +1,21 @@
+---
+arguments_string: fedora32-64a
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    fedora32-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: fedora-32-x86_64
+      packaging_platform: fedora-32-x86_64
+      template: fedora-32-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 
diff --git a/test/fixtures/generated/multiplatform/fedora32-64a-solaris114-64-fedora32-64aulcdfm b/test/fixtures/generated/multiplatform/fedora32-64a-solaris114-64-fedora32-64aulcdfm
@@ -0,0 +1,49 @@
+---
+arguments_string: fedora32-64a-solaris114-64-fedora32-64aulcdfm
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    fedora32-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: fedora-32-x86_64
+      packaging_platform: fedora-32-x86_64
+      template: fedora-32-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    solaris114-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: solaris-11.4-i386
+      packaging_platform: solaris-11-i386
+      template: solaris-114-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    fedora32-64-2:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: fedora-32-x86_64
+      packaging_platform: fedora-32-x86_64
+      template: fedora-32-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - ca
+      - classifier
+      - dashboard
+      - database
+      - frictionless
+      - master
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 
diff --git a/test/fixtures/generated/multiplatform/solaris114-64aulcdfm-fedora32-64-solaris114-64a b/test/fixtures/generated/multiplatform/solaris114-64aulcdfm-fedora32-64-solaris114-64a
@@ -0,0 +1,49 @@
+---
+arguments_string: solaris114-64aulcdfm-fedora32-64-solaris114-64a
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    solaris114-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: solaris-11.4-i386
+      packaging_platform: solaris-11-i386
+      template: solaris-114-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - ca
+      - classifier
+      - dashboard
+      - database
+      - frictionless
+      - master
+    fedora32-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: fedora-32-x86_64
+      packaging_platform: fedora-32-x86_64
+      template: fedora-32-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    solaris114-64-2:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: solaris-11.4-i386
+      packaging_platform: solaris-11-i386
+      template: solaris-114-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 
diff --git a/test/fixtures/generated/osinfo-version-0/fedora32-64a b/test/fixtures/generated/osinfo-version-0/fedora32-64a
@@ -0,0 +1,21 @@
+---
+arguments_string: "--osinfo-version 0 fedora32-64a"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    fedora32-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: fedora-32-x86_64
+      packaging_platform: fedora-32-x86_64
+      template: fedora-32-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 
diff --git a/test/fixtures/generated/osinfo-version-1/fedora32-64a b/test/fixtures/generated/osinfo-version-1/fedora32-64a
@@ -0,0 +1,21 @@
+---
+arguments_string: "--osinfo-version 1 fedora32-64a"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    fedora32-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: fedora-32-x86_64
+      packaging_platform: fedora-32-x86_64
+      template: fedora-32-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: