From 689192f9b90ecdae8c301ac9b2cb36f5e7564933 Mon Sep 17 00:00:00 2001 From: Gabriel Nagy Date: Wed, 12 May 2021 18:49:14 +0300 Subject: [PATCH] (IMAGES-1261) Add Fedora 34 support --- lib/beaker-hostgenerator/data.rb | 2 +- test/fixtures/generated/default/fedora34-64c | 21 ++++++++ ...ora34-64c-windows2012r2_fr-64-fedora34-64d | 46 +++++++++++++++++ ...r2_fr-64d-fedora34-64-windows2012r2_fr-64c | 50 +++++++++++++++++++ .../generated/osinfo-version-0/fedora34-64c | 21 ++++++++ .../generated/osinfo-version-1/fedora34-64c | 21 ++++++++ 6 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/generated/default/fedora34-64c create mode 100644 test/fixtures/generated/multiplatform/fedora34-64c-windows2012r2_fr-64-fedora34-64d create mode 100644 test/fixtures/generated/multiplatform/windows2012r2_fr-64d-fedora34-64-windows2012r2_fr-64c create mode 100644 test/fixtures/generated/osinfo-version-0/fedora34-64c create mode 100644 test/fixtures/generated/osinfo-version-1/fedora34-64c diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb index cbe6cb8f..82381ff4 100644 --- a/lib/beaker-hostgenerator/data.rb +++ b/lib/beaker-hostgenerator/data.rb @@ -83,7 +83,7 @@ def osinfo result = {} # Fedora - (19..33).each do |release| + (19..34).each do |release| # 32 bit support was dropped in Fedora 31 if release < 31 result["fedora#{release}-32"] = { diff --git a/test/fixtures/generated/default/fedora34-64c b/test/fixtures/generated/default/fedora34-64c new file mode 100644 index 00000000..708f8a07 --- /dev/null +++ b/test/fixtures/generated/default/fedora34-64c @@ -0,0 +1,21 @@ +--- +arguments_string: fedora34-64c +environment_variables: {} +expected_hash: + HOSTS: + fedora34-64-1: + pe_dir: + pe_ver: + pe_upgrade_dir: + pe_upgrade_ver: + platform: fedora-34-x86_64 + hypervisor: vmpooler + template: fedora-34-x86_64 + 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/fedora34-64c-windows2012r2_fr-64-fedora34-64d b/test/fixtures/generated/multiplatform/fedora34-64c-windows2012r2_fr-64-fedora34-64d new file mode 100644 index 00000000..1b7f97a4 --- /dev/null +++ b/test/fixtures/generated/multiplatform/fedora34-64c-windows2012r2_fr-64-fedora34-64d @@ -0,0 +1,46 @@ +--- +arguments_string: fedora34-64c-windows2012r2_fr-64-fedora34-64d +environment_variables: {} +expected_hash: + HOSTS: + fedora34-64-1: + pe_dir: + pe_ver: + pe_upgrade_dir: + pe_upgrade_ver: + platform: fedora-34-x86_64 + hypervisor: vmpooler + template: fedora-34-x86_64 + roles: + - agent + - dashboard + windows2012r2_fr-64-1: + pe_dir: + pe_ver: + pe_upgrade_dir: + pe_upgrade_ver: + platform: windows-2012r2-64 + packaging_platform: windows-2012-x64 + ruby_arch: x64 + template: win-2012r2-fr-x86_64 + user: Administrateur + locale: fr + hypervisor: vmpooler + roles: + - agent + fedora34-64-2: + pe_dir: + pe_ver: + pe_upgrade_dir: + pe_upgrade_ver: + platform: fedora-34-x86_64 + hypervisor: vmpooler + template: fedora-34-x86_64 + roles: + - agent + - database + CONFIG: + nfs_server: none + consoleport: 443 + pooling_api: http://vmpooler.delivery.puppetlabs.net/ +expected_exception: diff --git a/test/fixtures/generated/multiplatform/windows2012r2_fr-64d-fedora34-64-windows2012r2_fr-64c b/test/fixtures/generated/multiplatform/windows2012r2_fr-64d-fedora34-64-windows2012r2_fr-64c new file mode 100644 index 00000000..b9c3f675 --- /dev/null +++ b/test/fixtures/generated/multiplatform/windows2012r2_fr-64d-fedora34-64-windows2012r2_fr-64c @@ -0,0 +1,50 @@ +--- +arguments_string: windows2012r2_fr-64d-fedora34-64-windows2012r2_fr-64c +environment_variables: {} +expected_hash: + HOSTS: + windows2012r2_fr-64-1: + pe_dir: + pe_ver: + pe_upgrade_dir: + pe_upgrade_ver: + platform: windows-2012r2-64 + packaging_platform: windows-2012-x64 + ruby_arch: x64 + template: win-2012r2-fr-x86_64 + user: Administrateur + locale: fr + hypervisor: vmpooler + roles: + - agent + - database + fedora34-64-1: + pe_dir: + pe_ver: + pe_upgrade_dir: + pe_upgrade_ver: + platform: fedora-34-x86_64 + hypervisor: vmpooler + template: fedora-34-x86_64 + roles: + - agent + windows2012r2_fr-64-2: + pe_dir: + pe_ver: + pe_upgrade_dir: + pe_upgrade_ver: + platform: windows-2012r2-64 + packaging_platform: windows-2012-x64 + ruby_arch: x64 + template: win-2012r2-fr-x86_64 + user: Administrateur + locale: fr + 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-0/fedora34-64c b/test/fixtures/generated/osinfo-version-0/fedora34-64c new file mode 100644 index 00000000..46b1076e --- /dev/null +++ b/test/fixtures/generated/osinfo-version-0/fedora34-64c @@ -0,0 +1,21 @@ +--- +arguments_string: "--osinfo-version 0 fedora34-64c" +environment_variables: {} +expected_hash: + HOSTS: + fedora34-64-1: + pe_dir: + pe_ver: + pe_upgrade_dir: + pe_upgrade_ver: + platform: fedora-34-x86_64 + hypervisor: vmpooler + template: fedora-34-x86_64 + 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/fedora34-64c b/test/fixtures/generated/osinfo-version-1/fedora34-64c new file mode 100644 index 00000000..36cb6011 --- /dev/null +++ b/test/fixtures/generated/osinfo-version-1/fedora34-64c @@ -0,0 +1,21 @@ +--- +arguments_string: "--osinfo-version 1 fedora34-64c" +environment_variables: {} +expected_hash: + HOSTS: + fedora34-64-1: + pe_dir: + pe_ver: + pe_upgrade_dir: + pe_upgrade_ver: + platform: fedora-34-x86_64 + hypervisor: vmpooler + template: fedora-34-x86_64 + roles: + - agent + - dashboard + CONFIG: + nfs_server: none + consoleport: 443 + pooling_api: http://vmpooler.delivery.puppetlabs.net/ +expected_exception: