From fd7b9028004e80b310ba14caa662fd37442a0cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 7 Aug 2024 07:04:50 +0200 Subject: [PATCH] Add support for current Operating Systems The list of supported Operating Systems is outdated. Update it and add some basic acceptance tests to ensure the code is valid. --- .github/workflows/ci.yml | 2 +- .sync.yml | 2 ++ metadata.json | 15 +++++++++++---- spec/acceptance/init_spec.rb | 16 ++++++++++++++++ .../nodesets/centos-5-x86_64-docker.yml | 16 ---------------- spec/acceptance/nodesets/centos-5.yml | 17 ----------------- .../nodesets/centos-6-x86_64-docker.yml | 16 ---------------- .../nodesets/centos-6-x86_64-openstack.yml | 15 --------------- .../nodesets/centos-6-x86_64-vagrant.yml | 12 ------------ spec/acceptance/nodesets/centos-6.yml | 18 ------------------ .../nodesets/centos-7-x86_64-docker.yml | 16 ---------------- .../nodesets/centos-7-x86_64-openstack.yml | 15 --------------- .../nodesets/centos-7-x86_64-vagrant.yml | 12 ------------ .../nodesets/debian-6-x86_64-docker.yml | 16 ---------------- .../nodesets/debian-6-x86_64-openstack.yml | 15 --------------- .../nodesets/debian-6-x86_64-vagrant.yml | 12 ------------ spec/acceptance/nodesets/debian-6.yml | 16 ---------------- .../nodesets/debian-7-x86_64-docker.yml | 16 ---------------- .../nodesets/debian-7-x86_64-openstack.yml | 15 --------------- .../nodesets/debian-7-x86_64-vagrant.yml | 12 ------------ spec/acceptance/nodesets/debian-7.yml | 16 ---------------- .../nodesets/debian-8-x86_64-docker.yml | 16 ---------------- .../nodesets/debian-8-x86_64-openstack.yml | 15 --------------- .../nodesets/debian-8-x86_64-vagrant.yml | 12 ------------ spec/acceptance/nodesets/debian-8.yml | 17 ----------------- .../nodesets/ubuntu-10.04-x86_64-docker.yml | 15 --------------- .../nodesets/ubuntu-12.04-x86_64-docker.yml | 16 ---------------- .../ubuntu-12.04-x86_64-openstack.yml | 15 --------------- spec/acceptance/nodesets/ubuntu-12.04.yml | 17 ----------------- .../nodesets/ubuntu-14.04-x86_64-docker.yml | 16 ---------------- .../ubuntu-14.04-x86_64-openstack.yml | 15 --------------- .../nodesets/ubuntu-14.04-x86_64-vagrant.yml | 12 ------------ spec/acceptance/nodesets/ubuntu-14.04.yml | 19 ------------------- .../nodesets/ubuntu-14.10-x86_64-docker.yml | 16 ---------------- .../ubuntu-14.10-x86_64-openstack.yml | 15 --------------- spec/acceptance/nodesets/ubuntu-14.10.yml | 19 ------------------- .../nodesets/ubuntu-15.04-x86_64-docker.yml | 16 ---------------- .../ubuntu-15.04-x86_64-openstack.yml | 15 --------------- spec/acceptance/nodesets/ubuntu-15.04.yml | 17 ----------------- spec/acceptance/nodesets/ubuntu-15.10.yml | 17 ----------------- spec/acceptance/nodesets/ubuntu-16.04.yml | 17 ----------------- spec/spec_helper_acceptance.rb | 10 ++++++++++ 42 files changed, 40 insertions(+), 577 deletions(-) create mode 100644 spec/acceptance/init_spec.rb delete mode 100644 spec/acceptance/nodesets/centos-5-x86_64-docker.yml delete mode 100644 spec/acceptance/nodesets/centos-5.yml delete mode 100644 spec/acceptance/nodesets/centos-6-x86_64-docker.yml delete mode 100644 spec/acceptance/nodesets/centos-6-x86_64-openstack.yml delete mode 100644 spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml delete mode 100644 spec/acceptance/nodesets/centos-6.yml delete mode 100644 spec/acceptance/nodesets/centos-7-x86_64-docker.yml delete mode 100644 spec/acceptance/nodesets/centos-7-x86_64-openstack.yml delete mode 100644 spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml delete mode 100644 spec/acceptance/nodesets/debian-6-x86_64-docker.yml delete mode 100644 spec/acceptance/nodesets/debian-6-x86_64-openstack.yml delete mode 100644 spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml delete mode 100644 spec/acceptance/nodesets/debian-6.yml delete mode 100644 spec/acceptance/nodesets/debian-7-x86_64-docker.yml delete mode 100644 spec/acceptance/nodesets/debian-7-x86_64-openstack.yml delete mode 100644 spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml delete mode 100644 spec/acceptance/nodesets/debian-7.yml delete mode 100644 spec/acceptance/nodesets/debian-8-x86_64-docker.yml delete mode 100644 spec/acceptance/nodesets/debian-8-x86_64-openstack.yml delete mode 100644 spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml delete mode 100644 spec/acceptance/nodesets/debian-8.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-12.04.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-14.04.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-14.10.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-15.04.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-15.10.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-16.04.yml create mode 100644 spec/spec_helper_acceptance.rb diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f66457d..d758d05 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,6 @@ concurrency: jobs: puppet: name: Puppet - uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v2 + uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2 with: additional_packages: 'libaugeas-dev augeas-tools' diff --git a/.sync.yml b/.sync.yml index f060012..26f1bd8 100644 --- a/.sync.yml +++ b/.sync.yml @@ -6,3 +6,5 @@ Gemfile: .github/workflows/ci.yml: with: additional_packages: libaugeas-dev augeas-tools +spec/spec_helper_acceptance.rb: + unmanaged: false diff --git a/metadata.json b/metadata.json index 4a92c14..d456f6a 100644 --- a/metadata.json +++ b/metadata.json @@ -18,7 +18,9 @@ "operatingsystem": "Debian", "operatingsystemrelease": [ "6", - "7" + "7", + "10", + "11" ] }, { @@ -26,14 +28,17 @@ "operatingsystemrelease": [ "10.04", "12.04", - "14.04" + "14.04", + "20.04", + "22.04" ] }, { "operatingsystem": "RedHat", "operatingsystemrelease": [ "5", - "6" + "6", + "9" ] }, { @@ -50,7 +55,9 @@ "operatingsystem": "FreeBSD", "operatingsystemrelease": [ "11", - "12" + "12", + "13", + "14" ] } ], diff --git a/spec/acceptance/init_spec.rb b/spec/acceptance/init_spec.rb new file mode 100644 index 0000000..23401a6 --- /dev/null +++ b/spec/acceptance/init_spec.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +require 'spec_helper_acceptance' + +describe 'augeas class' do + context 'with default parameters' do + it_behaves_like 'an idempotent resource' do + let(:manifest) do + <<~PUPPET + class { 'augeas': + } + PUPPET + end + end + end +end diff --git a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml deleted file mode 100644 index 05cf774..0000000 --- a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - centos-5-x64: - default_apply_opts: - order: random - strict_variables: - platform: el-5-x86_64 - hypervisor: docker - image: centos:5 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'yum install -y crontabs tar wget' -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/centos-5.yml b/spec/acceptance/nodesets/centos-5.yml deleted file mode 100644 index e07adfd..0000000 --- a/spec/acceptance/nodesets/centos-5.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -HOSTS: - centos-5-x64: - default_apply_opts: - order: random - strict_variables: - platform: el-5-x86_64 - hypervisor: docker - image: tianon/centos:5.10 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'yum install -y crontabs tar wget which' - - 'sed -i -e "/mingetty/d" /etc/inittab' -CONFIG: - type: aio - log_level: debug diff --git a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml deleted file mode 100644 index 1cbeacf..0000000 --- a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - centos-6-x64: - default_apply_opts: - order: random - strict_variables: - platform: el-6-x86_64 - hypervisor: docker - image: centos:6 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'yum install -y crontabs tar wget' -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml deleted file mode 100644 index 39016e9..0000000 --- a/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -HOSTS: - centos-6-x64: - default_apply_opts: - order: random - strict_variables: - platform: el-6-x86_64 - hypervisor: openstack - flavor: m1.small - image: centos-6-latest - user: root -CONFIG: - type: foss - log_level: debug - openstack_network: default diff --git a/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml deleted file mode 100644 index 82af376..0000000 --- a/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -HOSTS: - centos-6-x64: - default_apply_opts: - order: random - strict_variables: - platform: el-6-x86_64 - hypervisor: vagrant - box: camptocamp/centos-6-x86_64 -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/centos-6.yml b/spec/acceptance/nodesets/centos-6.yml deleted file mode 100644 index 5cfd6fc..0000000 --- a/spec/acceptance/nodesets/centos-6.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -HOSTS: - centos-6-x64: - default_apply_opts: - order: random - strict_variables: - platform: el-6-x86_64 - hypervisor: docker - image: centos:6 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'rm -rf /var/run/network/*' - - 'yum install -y crontabs tar wget' - - 'rm /etc/init/tty.conf' -CONFIG: - type: aio - log_level: debug diff --git a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml deleted file mode 100644 index 329bf9e..0000000 --- a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - centos-7-x64: - default_apply_opts: - order: random - strict_variables: - platform: el-7-x86_64 - hypervisor: docker - image: centos:7 - docker_preserve_image: true - docker_cmd: '["/usr/sbin/init"]' - docker_image_commands: - - 'yum install -y crontabs tar wget' -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml deleted file mode 100644 index 5f3d7e8..0000000 --- a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -HOSTS: - centos-7-x64: - default_apply_opts: - order: random - strict_variables: - platform: el-7-x86_64 - hypervisor: openstack - flavor: m1.small - image: centos-7-latest - user: centos -CONFIG: - type: foss - log_level: debug - openstack_network: default diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml deleted file mode 100644 index 2064466..0000000 --- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -HOSTS: - centos-7-x64: - default_apply_opts: - order: random - strict_variables: - platform: el-7-x86_64 - hypervisor: vagrant - box: camptocamp/centos-7-x86_64 -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml deleted file mode 100644 index b15ce0b..0000000 --- a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - debian-6-x64: - default_apply_opts: - order: random - strict_variables: - platform: debian-6-amd64 - hypervisor: docker - image: debian:6 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y wget' -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml deleted file mode 100644 index e14e0dc..0000000 --- a/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -HOSTS: - debian-6-x64: - default_apply_opts: - order: random - strict_variables: - platform: debian-6-amd64 - hypervisor: openstack - flavor: m1.small - image: debian-6-latest - user: debian -CONFIG: - type: foss - log_level: debug - openstack_network: default diff --git a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml deleted file mode 100644 index c20e216..0000000 --- a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -HOSTS: - debian-6-x64: - default_apply_opts: - order: random - strict_variables: - platform: debian-6-amd64 - hypervisor: vagrant - box: puppetlabs/debian-6.0.10-64-nocm -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/debian-6.yml b/spec/acceptance/nodesets/debian-6.yml deleted file mode 100644 index 9204ee4..0000000 --- a/spec/acceptance/nodesets/debian-6.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - debian-6-x64: - default_apply_opts: - order: random - strict_variables: - platform: debian-6-amd64 - hypervisor: docker - image: debian/eol:squeeze - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y cron locales-all net-tools wget' -CONFIG: - type: aio - log_level: debug diff --git a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml deleted file mode 100644 index 63b9cdc..0000000 --- a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - debian-7-x64: - default_apply_opts: - order: random - strict_variables: - platform: debian-7-amd64 - hypervisor: docker - image: debian:7 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y cron wget' -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml deleted file mode 100644 index c1ce94f..0000000 --- a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -HOSTS: - debian-7-x64: - default_apply_opts: - order: random - strict_variables: - platform: debian-7-amd64 - hypervisor: openstack - flavor: m1.small - image: debian-7-latest - user: debian -CONFIG: - type: foss - log_level: debug - openstack_network: default diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml deleted file mode 100644 index 1097155..0000000 --- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -HOSTS: - debian-7-x64: - default_apply_opts: - order: random - strict_variables: - platform: debian-7-amd64 - hypervisor: vagrant - box: camptocamp/debian-7-amd64 -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/debian-7.yml b/spec/acceptance/nodesets/debian-7.yml deleted file mode 100644 index 90cc5cf..0000000 --- a/spec/acceptance/nodesets/debian-7.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - debian-7-x64: - default_apply_opts: - order: random - strict_variables: - platform: debian-7-amd64 - hypervisor: docker - image: debian:7 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y cron locales-all net-tools wget' -CONFIG: - type: aio - log_level: debug diff --git a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml deleted file mode 100644 index ca322f2..0000000 --- a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - debian-8-x64: - default_apply_opts: - order: random - strict_variables: - platform: debian-8-amd64 - hypervisor: docker - image: debian:8 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y cron wget' -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml deleted file mode 100644 index ba88c8e..0000000 --- a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -HOSTS: - debian-8-x64: - default_apply_opts: - order: random - strict_variables: - platform: debian-8-amd64 - hypervisor: openstack - flavor: m1.small - image: debian-8-latest - user: debian -CONFIG: - type: foss - log_level: debug - openstack_network: default diff --git a/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml deleted file mode 100644 index 7dcf7cd..0000000 --- a/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -HOSTS: - debian-8-x64: - default_apply_opts: - order: random - strict_variables: - platform: debian-8-amd64 - hypervisor: vagrant - box: camptocamp/debian-8-amd64 -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/debian-8.yml b/spec/acceptance/nodesets/debian-8.yml deleted file mode 100644 index e6b7701..0000000 --- a/spec/acceptance/nodesets/debian-8.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -HOSTS: - debian-8-x64: - default_apply_opts: - order: random - strict_variables: - platform: debian-8-amd64 - hypervisor: docker - image: debian:8 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y cron locales-all net-tools wget' - - 'rm -f /usr/sbin/policy-rc.d' -CONFIG: - type: aio - log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml deleted file mode 100644 index 93bb624..0000000 --- a/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# yamllint disable rule:line-length -HOSTS: - ubuntu-1004-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-10.04-amd64 - hypervisor: docker - image: ubuntu:10.04 - # This stops the image from being deleted on completion, speeding up the process. - docker_preserve_image: true -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml deleted file mode 100644 index 80aeb07..0000000 --- a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - ubuntu-1204-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-12.04-amd64 - hypervisor: docker - image: ubuntu:12.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y wget' -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml deleted file mode 100644 index cfe88c3..0000000 --- a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -HOSTS: - ubuntu-1204-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-12.04-amd64 - hypervisor: openstack - flavor: m1.small - image: ubuntu-1204-latest - user: ubuntu -CONFIG: - type: foss - log_level: debug - openstack_network: default diff --git a/spec/acceptance/nodesets/ubuntu-12.04.yml b/spec/acceptance/nodesets/ubuntu-12.04.yml deleted file mode 100644 index 13e0d81..0000000 --- a/spec/acceptance/nodesets/ubuntu-12.04.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -HOSTS: - ubuntu-1204-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-12.04-amd64 - hypervisor: docker - image: ubuntu:12.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y net-tools wget' - - 'locale-gen en_US.UTF-8' -CONFIG: - type: aio - log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml deleted file mode 100644 index cd0c0ed..0000000 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - ubuntu-1404-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-14.04-amd64 - hypervisor: docker - image: ubuntu:14.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y wget' -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml deleted file mode 100644 index 760a4b9..0000000 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -HOSTS: - ubuntu-1404-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-14.04-amd64 - hypervisor: openstack - flavor: m1.small - image: ubuntu-1404-latest - user: ubuntu -CONFIG: - type: foss - log_level: debug - openstack_network: default diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml deleted file mode 100644 index 2ae40c5..0000000 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -HOSTS: - ubuntu-1404-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-14.04-amd64 - hypervisor: vagrant - box: puppetlabs/ubuntu-14.04-64-nocm -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.04.yml b/spec/acceptance/nodesets/ubuntu-14.04.yml deleted file mode 100644 index ca6fd49..0000000 --- a/spec/acceptance/nodesets/ubuntu-14.04.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -HOSTS: - ubuntu-1404-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-14.04-amd64 - hypervisor: docker - image: ubuntu:14.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'rm /usr/sbin/policy-rc.d' - - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl' - - 'apt-get install -y net-tools wget' - - 'locale-gen en_US.UTF-8' -CONFIG: - type: aio - log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml deleted file mode 100644 index f0fe17e..0000000 --- a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - ubuntu-1410-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-14.10-amd64 - hypervisor: docker - image: ubuntu:14.10 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y wget' -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml deleted file mode 100644 index aa3a54f..0000000 --- a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -HOSTS: - ubuntu-1410-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-14.10-amd64 - hypervisor: openstack - flavor: m1.small - image: ubuntu-1410-latest - user: ubuntu -CONFIG: - type: foss - log_level: debug - openstack_network: default diff --git a/spec/acceptance/nodesets/ubuntu-14.10.yml b/spec/acceptance/nodesets/ubuntu-14.10.yml deleted file mode 100644 index c253489..0000000 --- a/spec/acceptance/nodesets/ubuntu-14.10.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -HOSTS: - ubuntu-1410-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-14.10-amd64 - hypervisor: docker - image: ubuntu:14.10 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'rm /usr/sbin/policy-rc.d' - - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl' - - 'apt-get install -y net-tools wget' - - 'locale-gen en_US.UTF-8' -CONFIG: - type: aio - log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml deleted file mode 100644 index 50a4f6e..0000000 --- a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - ubuntu-1504-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-15.04-amd64 - hypervisor: docker - image: ubuntu:15.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y wget' -CONFIG: - type: foss - log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml deleted file mode 100644 index 40fd518..0000000 --- a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -HOSTS: - ubuntu-1504-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-15.04-amd64 - hypervisor: openstack - flavor: m1.small - image: ubuntu-1504-latest - user: ubuntu -CONFIG: - type: foss - log_level: debug - openstack_network: default diff --git a/spec/acceptance/nodesets/ubuntu-15.04.yml b/spec/acceptance/nodesets/ubuntu-15.04.yml deleted file mode 100644 index 5e20aa5..0000000 --- a/spec/acceptance/nodesets/ubuntu-15.04.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -HOSTS: - ubuntu-1504-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-15.04-amd64 - hypervisor: docker - image: ubuntu:15.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y net-tools wget' - - 'locale-gen en_US.UTF-8' -CONFIG: - type: aio - log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-15.10.yml b/spec/acceptance/nodesets/ubuntu-15.10.yml deleted file mode 100644 index 7551cdd..0000000 --- a/spec/acceptance/nodesets/ubuntu-15.10.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -HOSTS: - ubuntu-1510-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-15.10-amd64 - hypervisor: docker - image: ubuntu:15.10 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y net-tools wget' - - 'locale-gen en_US.UTF-8' -CONFIG: - type: aio - log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-16.04.yml b/spec/acceptance/nodesets/ubuntu-16.04.yml deleted file mode 100644 index 73fbdff..0000000 --- a/spec/acceptance/nodesets/ubuntu-16.04.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -HOSTS: - ubuntu-1604-x64: - default_apply_opts: - order: random - strict_variables: - platform: ubuntu-16.04-amd64 - hypervisor: docker - image: ubuntu:16.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y net-tools wget' - - 'locale-gen en_US.UTF-8' -CONFIG: - type: aio - log_level: debug diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb new file mode 100644 index 0000000..2681792 --- /dev/null +++ b/spec/spec_helper_acceptance.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + +require 'voxpupuli/acceptance/spec_helper_acceptance' + +configure_beaker(modules: :metadata) + +Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }