From 47a59300f4d87c96529856af567e2ceea34a884e Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 21 Nov 2018 19:02:51 +0100 Subject: [PATCH] Remove some vagrant nodesets Replacements are based on beaker-hostgenerator. To generate them as static files: beaker-hostgenerator -t vagrant To generate them on the fly when running beaker: BEAKER_setfile={hypervisor=vagrant} Users of vagrant_libvirt can also specify it as hypervisor. moduleroot/spec/acceptance/nodesets/centos-6-x64.yml.erb centos6-64 moduleroot/spec/acceptance/nodesets/centos-66-x64-pe.yml.erb centos6-64mdc (not sure how to get PE in) moduleroot/spec/acceptance/nodesets/centos-7-x64.yml.erb centos7-64 moduleroot/spec/acceptance/nodesets/debian-82-x64.yml.erb debian8-64 moduleroot/spec/acceptance/nodesets/fedora-25-x64.yml.erb fedora25-64 moduleroot/spec/acceptance/nodesets/fedora-26-x64.yml.erb fedora26-64 moduleroot/spec/acceptance/nodesets/fedora-27-x64.yml.erb fedora27-64 moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml.erb ubuntu1404-64 moduleroot/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml.erb ubuntu1604-64 It also gives us the more current versions: debian9-64 fedora28-64 fedora29-64 ubuntu1804-64 I'm leaving ArchLinux and Windows descriptions for vagrant since I haven't looked at replacing them. The same goes for the ec2 descriptions. --- config_defaults.yml | 20 ++++++++++++++++++- .../acceptance/nodesets/centos-6-x64.yml.erb | 15 -------------- .../nodesets/centos-66-x64-pe.yml.erb | 17 ---------------- .../acceptance/nodesets/centos-7-x64.yml.erb | 15 -------------- .../acceptance/nodesets/debian-82-x64.yml.erb | 15 -------------- .../acceptance/nodesets/fedora-25-x64.yml.erb | 16 --------------- .../acceptance/nodesets/fedora-26-x64.yml.erb | 16 --------------- .../acceptance/nodesets/fedora-27-x64.yml.erb | 18 ----------------- .../nodesets/ubuntu-server-1404-x64.yml.erb | 15 -------------- .../nodesets/ubuntu-server-1604-x64.yml.erb | 15 -------------- 10 files changed, 19 insertions(+), 143 deletions(-) delete mode 100644 moduleroot/spec/acceptance/nodesets/centos-6-x64.yml.erb delete mode 100644 moduleroot/spec/acceptance/nodesets/centos-66-x64-pe.yml.erb delete mode 100644 moduleroot/spec/acceptance/nodesets/centos-7-x64.yml.erb delete mode 100644 moduleroot/spec/acceptance/nodesets/debian-82-x64.yml.erb delete mode 100644 moduleroot/spec/acceptance/nodesets/fedora-25-x64.yml.erb delete mode 100644 moduleroot/spec/acceptance/nodesets/fedora-26-x64.yml.erb delete mode 100644 moduleroot/spec/acceptance/nodesets/fedora-27-x64.yml.erb delete mode 100644 moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml.erb delete mode 100644 moduleroot/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml.erb diff --git a/config_defaults.yml b/config_defaults.yml index d43c3a34..6218c244 100644 --- a/config_defaults.yml +++ b/config_defaults.yml @@ -88,7 +88,7 @@ Gemfile: version: '>= 6' - gem: serverspec - gem: beaker-hostgenerator - version: '>= 1.1.10' + version: '>= 1.1.22' - gem: beaker-docker - gem: beaker-puppet - gem: beaker-puppet_install_helper @@ -122,5 +122,23 @@ Rakefile: default_enabled_rake_targets: - 'metadata_lint' - 'release_checks' +spec/acceptance/nodesets/centos-6-x64.yml: + delete: true +spec/acceptance/nodesets/centos-66-x64-pe.yml: + delete: true +spec/acceptance/nodesets/centos-7-x64.yml: + delete: true +spec/acceptance/nodesets/debian-82-x64.yml: + delete: true +spec/acceptance/nodesets/fedora-25-x64.yml: + delete: true +spec/acceptance/nodesets/fedora-26-x64.yml: + delete: true +spec/acceptance/nodesets/fedora-27-x64.yml: + delete: true +spec/acceptance/nodesets/ubuntu-server-1404-x64.yml: + delete: true +spec/acceptance/nodesets/ubuntu-server-1604-x64.yml: + delete: true ... # vim: syntax=yaml diff --git a/moduleroot/spec/acceptance/nodesets/centos-6-x64.yml.erb b/moduleroot/spec/acceptance/nodesets/centos-6-x64.yml.erb deleted file mode 100644 index 16abc8f1..00000000 --- a/moduleroot/spec/acceptance/nodesets/centos-6-x64.yml.erb +++ /dev/null @@ -1,15 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - centos-6-x64: - roles: - - master - platform: el-6-x86_64 - box: centos/6 - hypervisor: vagrant -CONFIG: - type: aio -... -# vim: syntax=yaml diff --git a/moduleroot/spec/acceptance/nodesets/centos-66-x64-pe.yml.erb b/moduleroot/spec/acceptance/nodesets/centos-66-x64-pe.yml.erb deleted file mode 100644 index 1e7aea6d..00000000 --- a/moduleroot/spec/acceptance/nodesets/centos-66-x64-pe.yml.erb +++ /dev/null @@ -1,17 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - centos-66-x64: - roles: - - master - - database - - dashboard - platform: el-6-x86_64 - box: puppetlabs/centos-6.6-64-puppet-enterprise - hypervisor: vagrant -CONFIG: - type: pe -... -# vim: syntax=yaml diff --git a/moduleroot/spec/acceptance/nodesets/centos-7-x64.yml.erb b/moduleroot/spec/acceptance/nodesets/centos-7-x64.yml.erb deleted file mode 100644 index e05a3ae1..00000000 --- a/moduleroot/spec/acceptance/nodesets/centos-7-x64.yml.erb +++ /dev/null @@ -1,15 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - centos-7-x64: - roles: - - master - platform: el-7-x86_64 - box: centos/7 - hypervisor: vagrant -CONFIG: - type: aio -... -# vim: syntax=yaml diff --git a/moduleroot/spec/acceptance/nodesets/debian-82-x64.yml.erb b/moduleroot/spec/acceptance/nodesets/debian-82-x64.yml.erb deleted file mode 100644 index 9897a8fc..00000000 --- a/moduleroot/spec/acceptance/nodesets/debian-82-x64.yml.erb +++ /dev/null @@ -1,15 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - debian-82-x64: - roles: - - master - platform: debian-8-amd64 - box: puppetlabs/debian-8.2-64-nocm - hypervisor: vagrant -CONFIG: - type: foss -... -# vim: syntax=yaml diff --git a/moduleroot/spec/acceptance/nodesets/fedora-25-x64.yml.erb b/moduleroot/spec/acceptance/nodesets/fedora-25-x64.yml.erb deleted file mode 100644 index 54dd3305..00000000 --- a/moduleroot/spec/acceptance/nodesets/fedora-25-x64.yml.erb +++ /dev/null @@ -1,16 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -# -HOSTS: - fedora-25-x64: - roles: - - master - platform: fedora-25-x86_64 - box: fedora/25-cloud-base - hypervisor: vagrant -CONFIG: - type: aio -... -# vim: syntax=yaml diff --git a/moduleroot/spec/acceptance/nodesets/fedora-26-x64.yml.erb b/moduleroot/spec/acceptance/nodesets/fedora-26-x64.yml.erb deleted file mode 100644 index 598822b0..00000000 --- a/moduleroot/spec/acceptance/nodesets/fedora-26-x64.yml.erb +++ /dev/null @@ -1,16 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -# -HOSTS: - fedora-26-x64: - roles: - - master - platform: fedora-26-x86_64 - box: fedora/26-cloud-base - hypervisor: vagrant -CONFIG: - type: aio -... -# vim: syntax=yaml diff --git a/moduleroot/spec/acceptance/nodesets/fedora-27-x64.yml.erb b/moduleroot/spec/acceptance/nodesets/fedora-27-x64.yml.erb deleted file mode 100644 index c2b61ebb..00000000 --- a/moduleroot/spec/acceptance/nodesets/fedora-27-x64.yml.erb +++ /dev/null @@ -1,18 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -# -# platform is fedora 26 because there is no puppet-agent -# for fedora 27 as of 2017-11-17 -HOSTS: - fedora-27-x64: - roles: - - master - platform: fedora-26-x86_64 - box: fedora/27-cloud-base - hypervisor: vagrant -CONFIG: - type: aio -... -# vim: syntax=yaml diff --git a/moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml.erb b/moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml.erb deleted file mode 100644 index 054e6588..00000000 --- a/moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml.erb +++ /dev/null @@ -1,15 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - ubuntu-server-1404-x64: - roles: - - master - platform: ubuntu-14.04-amd64 - box: puppetlabs/ubuntu-14.04-64-nocm - hypervisor: vagrant -CONFIG: - type: foss -... -# vim: syntax=yaml diff --git a/moduleroot/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml.erb b/moduleroot/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml.erb deleted file mode 100644 index bc85e0e8..00000000 --- a/moduleroot/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml.erb +++ /dev/null @@ -1,15 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - ubuntu-server-1604-x64: - roles: - - master - platform: ubuntu-16.04-amd64 - box: puppetlabs/ubuntu-16.04-64-nocm - hypervisor: vagrant -CONFIG: - type: foss -... -# vim: syntax=yaml