From eb808c4a6c055b9d41dc80890146ac9b5a2eca62 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 4 Aug 2023 17:51:13 +0200 Subject: [PATCH] Drop legacy oracle 32bit / oracle 6 data Result of a discussion we had in https://github.com/voxpupuli/beaker-hostgenerator/pull/321 --- lib/beaker-hostgenerator/data.rb | 3 +- test/fixtures/generated/default/oracle6-32d | 15 ---------- test/fixtures/generated/default/oracle6-64f | 15 ---------- .../oracle6-32d-solaris11-SPARC-oracle6-32c | 27 ----------------- .../oracle6-64f-solaris11-64-oracle6-64l | 28 ----------------- .../solaris11-64m-oracle6-64-solaris11-64u | 28 ----------------- ...1-SPARCaulcdfm-oracle6-32-solaris11-SPARCa | 30 ------------------- .../generated/osinfo-version-0/oracle6-32d | 15 ---------- .../generated/osinfo-version-0/oracle6-64f | 15 ---------- .../generated/osinfo-version-1/oracle6-32d | 15 ---------- .../generated/osinfo-version-1/oracle6-64f | 15 ---------- 11 files changed, 1 insertion(+), 205 deletions(-) delete mode 100644 test/fixtures/generated/default/oracle6-32d delete mode 100644 test/fixtures/generated/default/oracle6-64f delete mode 100644 test/fixtures/generated/multiplatform/oracle6-32d-solaris11-SPARC-oracle6-32c delete mode 100644 test/fixtures/generated/multiplatform/oracle6-64f-solaris11-64-oracle6-64l delete mode 100644 test/fixtures/generated/multiplatform/solaris11-64m-oracle6-64-solaris11-64u delete mode 100644 test/fixtures/generated/multiplatform/solaris11-SPARCaulcdfm-oracle6-32-solaris11-SPARCa delete mode 100644 test/fixtures/generated/osinfo-version-0/oracle6-32d delete mode 100644 test/fixtures/generated/osinfo-version-0/oracle6-64f delete mode 100644 test/fixtures/generated/osinfo-version-1/oracle6-32d delete mode 100644 test/fixtures/generated/osinfo-version-1/oracle6-64f diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb index 3a6f4622..faa01c70 100644 --- a/lib/beaker-hostgenerator/data.rb +++ b/lib/beaker-hostgenerator/data.rb @@ -1140,8 +1140,7 @@ def generate_osinfo end # Oracle / OracleLinux - yield ['oracle6-32', 'el-6-i386'] - (6..9).each do |release| + (7..9).each do |release| yield ["oracle#{release}-64", "el-#{release}-x86_64"] end diff --git a/test/fixtures/generated/default/oracle6-32d b/test/fixtures/generated/default/oracle6-32d deleted file mode 100644 index 832bc25a..00000000 --- a/test/fixtures/generated/default/oracle6-32d +++ /dev/null @@ -1,15 +0,0 @@ ---- -arguments_string: oracle6-32d -environment_variables: {} -expected_hash: - HOSTS: - oracle6-32-1: - hypervisor: vmpooler - platform: el-6-i386 - template: oracle-6-i386 - roles: - - agent - - database - CONFIG: - pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ -expected_exception: diff --git a/test/fixtures/generated/default/oracle6-64f b/test/fixtures/generated/default/oracle6-64f deleted file mode 100644 index d56014b7..00000000 --- a/test/fixtures/generated/default/oracle6-64f +++ /dev/null @@ -1,15 +0,0 @@ ---- -arguments_string: oracle6-64f -environment_variables: {} -expected_hash: - HOSTS: - oracle6-64-1: - hypervisor: vmpooler - platform: el-6-x86_64 - template: oracle-6-x86_64 - roles: - - agent - - frictionless - CONFIG: - pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ -expected_exception: diff --git a/test/fixtures/generated/multiplatform/oracle6-32d-solaris11-SPARC-oracle6-32c b/test/fixtures/generated/multiplatform/oracle6-32d-solaris11-SPARC-oracle6-32c deleted file mode 100644 index ba81e1a6..00000000 --- a/test/fixtures/generated/multiplatform/oracle6-32d-solaris11-SPARC-oracle6-32c +++ /dev/null @@ -1,27 +0,0 @@ ---- -arguments_string: oracle6-32d-solaris11-SPARC-oracle6-32c -environment_variables: {} -expected_hash: - HOSTS: - oracle6-32-1: - hypervisor: vmpooler - platform: el-6-i386 - template: oracle-6-i386 - roles: - - agent - - database - solaris11-SPARC-1: - hypervisor: vmpooler - platform: solaris-11-sparc - roles: - - agent - oracle6-32-2: - hypervisor: vmpooler - platform: el-6-i386 - template: oracle-6-i386 - roles: - - agent - - dashboard - CONFIG: - pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ -expected_exception: diff --git a/test/fixtures/generated/multiplatform/oracle6-64f-solaris11-64-oracle6-64l b/test/fixtures/generated/multiplatform/oracle6-64f-solaris11-64-oracle6-64l deleted file mode 100644 index 95a95a92..00000000 --- a/test/fixtures/generated/multiplatform/oracle6-64f-solaris11-64-oracle6-64l +++ /dev/null @@ -1,28 +0,0 @@ ---- -arguments_string: oracle6-64f-solaris11-64-oracle6-64l -environment_variables: {} -expected_hash: - HOSTS: - oracle6-64-1: - hypervisor: vmpooler - platform: el-6-x86_64 - template: oracle-6-x86_64 - roles: - - agent - - frictionless - solaris11-64-1: - hypervisor: vmpooler - platform: solaris-11-i386 - template: solaris-11-x86_64 - roles: - - agent - oracle6-64-2: - hypervisor: vmpooler - platform: el-6-x86_64 - template: oracle-6-x86_64 - roles: - - agent - - classifier - CONFIG: - pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ -expected_exception: diff --git a/test/fixtures/generated/multiplatform/solaris11-64m-oracle6-64-solaris11-64u b/test/fixtures/generated/multiplatform/solaris11-64m-oracle6-64-solaris11-64u deleted file mode 100644 index 51cb6874..00000000 --- a/test/fixtures/generated/multiplatform/solaris11-64m-oracle6-64-solaris11-64u +++ /dev/null @@ -1,28 +0,0 @@ ---- -arguments_string: solaris11-64m-oracle6-64-solaris11-64u -environment_variables: {} -expected_hash: - HOSTS: - solaris11-64-1: - hypervisor: vmpooler - platform: solaris-11-i386 - template: solaris-11-x86_64 - roles: - - agent - - master - oracle6-64-1: - hypervisor: vmpooler - platform: el-6-x86_64 - template: oracle-6-x86_64 - roles: - - agent - solaris11-64-2: - hypervisor: vmpooler - platform: solaris-11-i386 - template: solaris-11-x86_64 - roles: - - agent - - ca - CONFIG: - pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ -expected_exception: diff --git a/test/fixtures/generated/multiplatform/solaris11-SPARCaulcdfm-oracle6-32-solaris11-SPARCa b/test/fixtures/generated/multiplatform/solaris11-SPARCaulcdfm-oracle6-32-solaris11-SPARCa deleted file mode 100644 index 9987575b..00000000 --- a/test/fixtures/generated/multiplatform/solaris11-SPARCaulcdfm-oracle6-32-solaris11-SPARCa +++ /dev/null @@ -1,30 +0,0 @@ ---- -arguments_string: solaris11-SPARCaulcdfm-oracle6-32-solaris11-SPARCa -environment_variables: {} -expected_hash: - HOSTS: - solaris11-SPARC-1: - hypervisor: vmpooler - platform: solaris-11-sparc - roles: - - agent - - ca - - classifier - - dashboard - - database - - frictionless - - master - oracle6-32-1: - hypervisor: vmpooler - platform: el-6-i386 - template: oracle-6-i386 - roles: - - agent - solaris11-SPARC-2: - hypervisor: vmpooler - platform: solaris-11-sparc - roles: - - agent - CONFIG: - pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ -expected_exception: diff --git a/test/fixtures/generated/osinfo-version-0/oracle6-32d b/test/fixtures/generated/osinfo-version-0/oracle6-32d deleted file mode 100644 index c6e48acf..00000000 --- a/test/fixtures/generated/osinfo-version-0/oracle6-32d +++ /dev/null @@ -1,15 +0,0 @@ ---- -arguments_string: "--osinfo-version 0 oracle6-32d" -environment_variables: {} -expected_hash: - HOSTS: - oracle6-32-1: - hypervisor: vmpooler - platform: el-6-i386 - template: oracle-6-i386 - roles: - - agent - - database - CONFIG: - pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ -expected_exception: diff --git a/test/fixtures/generated/osinfo-version-0/oracle6-64f b/test/fixtures/generated/osinfo-version-0/oracle6-64f deleted file mode 100644 index e7636cae..00000000 --- a/test/fixtures/generated/osinfo-version-0/oracle6-64f +++ /dev/null @@ -1,15 +0,0 @@ ---- -arguments_string: "--osinfo-version 0 oracle6-64f" -environment_variables: {} -expected_hash: - HOSTS: - oracle6-64-1: - hypervisor: vmpooler - platform: el-6-x86_64 - template: oracle-6-x86_64 - roles: - - agent - - frictionless - CONFIG: - pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ -expected_exception: diff --git a/test/fixtures/generated/osinfo-version-1/oracle6-32d b/test/fixtures/generated/osinfo-version-1/oracle6-32d deleted file mode 100644 index 61748916..00000000 --- a/test/fixtures/generated/osinfo-version-1/oracle6-32d +++ /dev/null @@ -1,15 +0,0 @@ ---- -arguments_string: "--osinfo-version 1 oracle6-32d" -environment_variables: {} -expected_hash: - HOSTS: - oracle6-32-1: - hypervisor: vmpooler - platform: el-6-i386 - template: oracle-6-i386 - roles: - - agent - - database - CONFIG: - pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ -expected_exception: diff --git a/test/fixtures/generated/osinfo-version-1/oracle6-64f b/test/fixtures/generated/osinfo-version-1/oracle6-64f deleted file mode 100644 index bec7ffde..00000000 --- a/test/fixtures/generated/osinfo-version-1/oracle6-64f +++ /dev/null @@ -1,15 +0,0 @@ ---- -arguments_string: "--osinfo-version 1 oracle6-64f" -environment_variables: {} -expected_hash: - HOSTS: - oracle6-64-1: - hypervisor: vmpooler - platform: el-6-x86_64 - template: oracle-6-x86_64 - roles: - - agent - - frictionless - CONFIG: - pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/ -expected_exception: