From b093fc62c6793b2df0149b923407c4ff8e8d04de 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 --------------- .../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 --------------- 7 files changed, 1 insertion(+), 92 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/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/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: