Merge pull request #195 from ciprianbadescu/IMAGES-1238/add-ubuntu200…

…4-AARCH64 (IMAGES-1238) add ubuntu2004-AARCH64 platform
voxpupuli · Nov 18, 2020 · 6a1de16 · 6a1de16
2 parents 9ee4f2d + c5fbd29
commit 6a1de16
Show file tree

Hide file tree

Showing 6 changed files with 156 additions and 0 deletions.
diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb
@@ -1478,6 +1478,15 @@ def osinfo
             'template' => 'ubuntu-2004-x86_64'
           }
         },
+        'ubuntu2004-AARCH64' => {
+          :general => {
+            'platform'           => 'ubuntu-20.04-aarch64',
+            'packaging_platform' => 'ubuntu-20.04-aarch64'
+          },
+          :abs => {
+            'template' => 'ubuntu-2004-arm64'
+          },
+        },
         'vro6-64' => {
           :general => {
             'platform'           => 'sles-11-x86_64',

diff --git a/test/fixtures/generated/default/ubuntu2004-AARCH64c b/test/fixtures/generated/default/ubuntu2004-AARCH64c
@@ -0,0 +1,21 @@
+---
+arguments_string: ubuntu2004-AARCH64c
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    ubuntu2004-AARCH64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: ubuntu-20.04-aarch64
+      packaging_platform: ubuntu-20.04-aarch64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - dashboard
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 
diff --git a/test/fixtures/generated/multiplatform/fedora20-32m-ubuntu2004-AARCH64-fedora20-32u b/test/fixtures/generated/multiplatform/fedora20-32m-ubuntu2004-AARCH64-fedora20-32u
@@ -0,0 +1,42 @@
+---
+arguments_string: fedora20-32m-ubuntu2004-AARCH64-fedora20-32u
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    fedora20-32-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: fedora-20-i386
+      template: fedora-20-i386
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - master
+    ubuntu2004-AARCH64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: ubuntu-20.04-aarch64
+      packaging_platform: ubuntu-20.04-aarch64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    fedora20-32-2:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: fedora-20-i386
+      template: fedora-20-i386
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - ca
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 
diff --git a/test/fixtures/generated/multiplatform/ubuntu2004-AARCH64c-fedora20-32-ubuntu2004-AARCH64d b/test/fixtures/generated/multiplatform/ubuntu2004-AARCH64c-fedora20-32-ubuntu2004-AARCH64d
@@ -0,0 +1,42 @@
+---
+arguments_string: ubuntu2004-AARCH64c-fedora20-32-ubuntu2004-AARCH64d
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    ubuntu2004-AARCH64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: ubuntu-20.04-aarch64
+      packaging_platform: ubuntu-20.04-aarch64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - dashboard
+    fedora20-32-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: fedora-20-i386
+      template: fedora-20-i386
+      hypervisor: vmpooler
+      roles:
+      - agent
+    ubuntu2004-AARCH64-2:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: ubuntu-20.04-aarch64
+      packaging_platform: ubuntu-20.04-aarch64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - database
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 
diff --git a/test/fixtures/generated/osinfo-version-0/ubuntu2004-AARCH64c b/test/fixtures/generated/osinfo-version-0/ubuntu2004-AARCH64c
@@ -0,0 +1,21 @@
+---
+arguments_string: "--osinfo-version 0 ubuntu2004-AARCH64c"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    ubuntu2004-AARCH64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: ubuntu-20.04-aarch64
+      packaging_platform: ubuntu-20.04-aarch64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - dashboard
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 
diff --git a/test/fixtures/generated/osinfo-version-1/ubuntu2004-AARCH64c b/test/fixtures/generated/osinfo-version-1/ubuntu2004-AARCH64c
@@ -0,0 +1,21 @@
+---
+arguments_string: "--osinfo-version 1 ubuntu2004-AARCH64c"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    ubuntu2004-AARCH64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      platform: ubuntu-20.04-aarch64
+      packaging_platform: ubuntu-20.04-aarch64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - dashboard
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: