From 936e406f1d1aa043c724aafe372a16933e89d9c3 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Mon, 31 Aug 2020 21:38:45 +0200 Subject: [PATCH] Change to Litmus Depends-On: https://review.opendev.org/#/c/752300/ Change-Id: Iebbb82beefb1278fa43b1c6123c46931af8f9c2f --- README.md | 4 ---- Rakefile | 1 + moduleroot/spec/acceptance/nodesets/centos-70-x64.yml | 11 ----------- moduleroot/spec/acceptance/nodesets/default.yml | 10 ---------- .../spec/acceptance/nodesets/nodepool-bionic.yml | 10 ---------- .../spec/acceptance/nodesets/nodepool-centos7.yml | 10 ---------- .../spec/acceptance/nodesets/nodepool-trusty.yml | 10 ---------- .../spec/acceptance/nodesets/nodepool-xenial.yml | 10 ---------- .../acceptance/nodesets/ubuntu-server-1404-x64.yml | 11 ----------- moduleroot/spec/spec_helper_acceptance.rb | 2 +- run_litmus_tests.sh | 10 ++++++++++ 11 files changed, 12 insertions(+), 77 deletions(-) create mode 100644 Rakefile delete mode 100644 moduleroot/spec/acceptance/nodesets/centos-70-x64.yml delete mode 100644 moduleroot/spec/acceptance/nodesets/default.yml delete mode 100644 moduleroot/spec/acceptance/nodesets/nodepool-bionic.yml delete mode 100644 moduleroot/spec/acceptance/nodesets/nodepool-centos7.yml delete mode 100644 moduleroot/spec/acceptance/nodesets/nodepool-trusty.yml delete mode 100644 moduleroot/spec/acceptance/nodesets/nodepool-xenial.yml delete mode 100644 moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml create mode 100755 run_litmus_tests.sh diff --git a/README.md b/README.md index edcbea1..a0af5ef 100644 --- a/README.md +++ b/README.md @@ -97,10 +97,6 @@ array with the key "paths" in your .gitignore section in .sync.yml. Flat file that simply requires the module_spec_helper from the puppetlabs_spec_helper. -**`moduleroot/spec/acceptance/nodesets/*`** - -Flat files containing default nodesets to run beaker-rspec on. - ## Special Options ### Unmanaged Files diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..168d108 --- /dev/null +++ b/Rakefile @@ -0,0 +1 @@ +require 'puppet-openstack_spec_helper/rake_tasks' diff --git a/moduleroot/spec/acceptance/nodesets/centos-70-x64.yml b/moduleroot/spec/acceptance/nodesets/centos-70-x64.yml deleted file mode 100644 index 5f097e9..0000000 --- a/moduleroot/spec/acceptance/nodesets/centos-70-x64.yml +++ /dev/null @@ -1,11 +0,0 @@ -HOSTS: - centos-server-70-x64: - roles: - - master - platform: el-7-x86_64 - box: puppetlabs/centos-7.0-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/centos-7.0-64-nocm - hypervisor: vagrant -CONFIG: - log_level: debug - type: foss diff --git a/moduleroot/spec/acceptance/nodesets/default.yml b/moduleroot/spec/acceptance/nodesets/default.yml deleted file mode 100644 index 486b6a3..0000000 --- a/moduleroot/spec/acceptance/nodesets/default.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-server-14.04-amd64: - roles: - - master - platform: ubuntu-14.04-amd64 - box: puppetlabs/ubuntu-14.04-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm - hypervisor: vagrant -CONFIG: - type: foss diff --git a/moduleroot/spec/acceptance/nodesets/nodepool-bionic.yml b/moduleroot/spec/acceptance/nodesets/nodepool-bionic.yml deleted file mode 100644 index ad73cc5..0000000 --- a/moduleroot/spec/acceptance/nodesets/nodepool-bionic.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-18.04-amd64: - roles: - - master - platform: ubuntu-18.04-amd64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/moduleroot/spec/acceptance/nodesets/nodepool-centos7.yml b/moduleroot/spec/acceptance/nodesets/nodepool-centos7.yml deleted file mode 100644 index c552874..0000000 --- a/moduleroot/spec/acceptance/nodesets/nodepool-centos7.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-70-x64: - roles: - - master - platform: el-7-x86_64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/moduleroot/spec/acceptance/nodesets/nodepool-trusty.yml b/moduleroot/spec/acceptance/nodesets/nodepool-trusty.yml deleted file mode 100644 index 9fc624e..0000000 --- a/moduleroot/spec/acceptance/nodesets/nodepool-trusty.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-14.04-amd64: - roles: - - master - platform: ubuntu-14.04-amd64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/moduleroot/spec/acceptance/nodesets/nodepool-xenial.yml b/moduleroot/spec/acceptance/nodesets/nodepool-xenial.yml deleted file mode 100644 index 99dd318..0000000 --- a/moduleroot/spec/acceptance/nodesets/nodepool-xenial.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-16.04-amd64: - roles: - - master - platform: ubuntu-16.04-amd64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml deleted file mode 100644 index 8001929..0000000 --- a/moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml +++ /dev/null @@ -1,11 +0,0 @@ -HOSTS: - ubuntu-server-14.04-amd64: - roles: - - master - platform: ubuntu-14.04-amd64 - box: puppetlabs/ubuntu-14.04-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm - hypervisor: vagrant -CONFIG: - log_level: debug - type: foss diff --git a/moduleroot/spec/spec_helper_acceptance.rb b/moduleroot/spec/spec_helper_acceptance.rb index 9196bc9..d51dfdb 100644 --- a/moduleroot/spec/spec_helper_acceptance.rb +++ b/moduleroot/spec/spec_helper_acceptance.rb @@ -1 +1 @@ -require 'puppet-openstack_spec_helper/beaker_spec_helper' +require 'puppet-openstack_spec_helper/litmus_spec_helper' diff --git a/run_litmus_tests.sh b/run_litmus_tests.sh new file mode 100755 index 0000000..d47ffc9 --- /dev/null +++ b/run_litmus_tests.sh @@ -0,0 +1,10 @@ +#!/bin/bash -ex + +export SCRIPT_DIR=$(cd `dirname $0` && pwd -P) +source $SCRIPT_DIR/functions + +install_module + +# run litmus tests +export RSPEC_DEBUG=true +$GEM_HOME/bin/bundle exec rake litmus:acceptance:localhost