From 9bcd2d9b63e189a5508eaa6c24e7471b9704cc02 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Mon, 31 Aug 2020 21:52:16 +0200 Subject: [PATCH] Add Puppet Litmus Depends-On: https://review.opendev.org/#/c/740601/ Change-Id: Ib8bb514a122d91fb3695d2c54b047388c61bef97 --- .zuul.yaml | 2 +- README.md | 21 ++----------------- spec/acceptance/nodesets/centos-70-x64.yml | 11 ---------- spec/acceptance/nodesets/default.yml | 10 --------- spec/acceptance/nodesets/nodepool-bionic.yml | 10 --------- spec/acceptance/nodesets/nodepool-centos7.yml | 10 --------- spec/acceptance/nodesets/nodepool-centos8.yml | 10 --------- spec/acceptance/nodesets/nodepool-trusty.yml | 10 --------- spec/acceptance/nodesets/nodepool-xenial.yml | 10 --------- .../nodesets/ubuntu-server-1404-x64.yml | 11 ---------- spec/spec_helper_acceptance.rb | 2 +- 11 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 spec/acceptance/nodesets/centos-70-x64.yml delete mode 100644 spec/acceptance/nodesets/default.yml delete mode 100644 spec/acceptance/nodesets/nodepool-bionic.yml delete mode 100644 spec/acceptance/nodesets/nodepool-centos7.yml delete mode 100644 spec/acceptance/nodesets/nodepool-centos8.yml delete mode 100644 spec/acceptance/nodesets/nodepool-trusty.yml delete mode 100644 spec/acceptance/nodesets/nodepool-xenial.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-server-1404-x64.yml diff --git a/.zuul.yaml b/.zuul.yaml index 6398fb5..486108d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,5 +3,5 @@ - puppet-openstack-check-jobs - puppet-openstack-module-unit-jobs - puppet-openstack-integration-jobs-all - - puppet-openstack-beaker-jobs + - puppet-openstack-litmus-jobs - release-notes-jobs-python3 diff --git a/README.md b/README.md index f59ab49..301f946 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,8 @@ Team and repository tags 3. [Setup - The basics of getting started with placement](#setup) 4. [Implementation - An under-the-hood peek at what the module is doing](#implementation) 5. [Limitations - OS compatibility, etc.](#limitations) -6. [Beaker-Rspec - Beaker-rspec tests for the project](#beaker-rspec) -7. [Development - Guide for contributing to the module](#development) -8. [Contributors - Those with commits](#contributors) +6. [Development - Guide for contributing to the module](#development) +7. [Contributors - Those with commits](#contributors) Overview -------- @@ -54,22 +53,6 @@ Limitations * All the placement types use the CLI tools and so need to be ran on the placement node. -Beaker-Rspec ------------- - -This module has beaker-rspec tests - -To run the tests on the default vagrant node: - -```shell -bundle install -bundle exec rake acceptance -``` - -For more information on writing and running beaker-rspec tests visit the documentation: - -* https://github.com/puppetlabs/beaker-rspec/blob/master/README.md - Development ----------- diff --git a/spec/acceptance/nodesets/centos-70-x64.yml b/spec/acceptance/nodesets/centos-70-x64.yml deleted file mode 100644 index 5f097e9..0000000 --- a/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/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml deleted file mode 100644 index 486b6a3..0000000 --- a/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/spec/acceptance/nodesets/nodepool-bionic.yml b/spec/acceptance/nodesets/nodepool-bionic.yml deleted file mode 100644 index ad73cc5..0000000 --- a/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/spec/acceptance/nodesets/nodepool-centos7.yml b/spec/acceptance/nodesets/nodepool-centos7.yml deleted file mode 100644 index c552874..0000000 --- a/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/spec/acceptance/nodesets/nodepool-centos8.yml b/spec/acceptance/nodesets/nodepool-centos8.yml deleted file mode 100644 index 4111da1..0000000 --- a/spec/acceptance/nodesets/nodepool-centos8.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-80-x64: - roles: - - master - platform: el-8-x86_64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/spec/acceptance/nodesets/nodepool-trusty.yml b/spec/acceptance/nodesets/nodepool-trusty.yml deleted file mode 100644 index 9fc624e..0000000 --- a/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/spec/acceptance/nodesets/nodepool-xenial.yml b/spec/acceptance/nodesets/nodepool-xenial.yml deleted file mode 100644 index 99dd318..0000000 --- a/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/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml deleted file mode 100644 index 8001929..0000000 --- a/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/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 9196bc9..d51dfdb 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1 +1 @@ -require 'puppet-openstack_spec_helper/beaker_spec_helper' +require 'puppet-openstack_spec_helper/litmus_spec_helper'