From faf436f3b54515ada46a1835a078e92e66766215 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Mon, 31 Aug 2020 21:25:18 +0200 Subject: [PATCH] Add Puppet Litmus Depends-On: https://review.opendev.org/#/c/740601/ Change-Id: I1fed24f8beb1fd2ec1bd7c7d58b480243c0a43e1 --- .zuul.yaml | 2 +- README.md | 21 ++++--------------- spec/acceptance/horizon_with_apache_spec.rb | 6 +++--- 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 +- 12 files changed, 9 insertions(+), 104 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 2182f69e..8717af98 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,7 +3,7 @@ - puppet-openstack-check-jobs - puppet-openstack-module-unit-jobs - puppet-openstack-integration-jobs-scenario003 - - puppet-openstack-beaker-jobs + - puppet-openstack-litmus-jobs - release-notes-jobs-python3 check: jobs: diff --git a/README.md b/README.md index 8d5f17d0..85fb46a4 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,10 @@ horizon 3. [Setup - The basics of getting started with horizon](#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. [Release Notes - Release notes for the project](#release-notes) -9. [Contributors - Those with commits](#contributors) -10. [Repository - The project source code repository](#repository) +6. [Development - Guide for contributing to the module](#development) +7. [Release Notes - Release notes for the project](#release-notes) +8. [Contributors - Those with commits](#contributors) +9. [Repository - The project source code repository](#repository) Overview -------- @@ -78,18 +77,6 @@ Limitations * Only supports Apache using mod_wsgi. -Beaker-Rspec ------------- - -This module has beaker-rspec tests - -To run: - -```shell -bundle install -bundle exec rspec spec/acceptance -``` - Development ----------- diff --git a/spec/acceptance/horizon_with_apache_spec.rb b/spec/acceptance/horizon_with_apache_spec.rb index 81680914..adef8910 100644 --- a/spec/acceptance/horizon_with_apache_spec.rb +++ b/spec/acceptance/horizon_with_apache_spec.rb @@ -30,13 +30,13 @@ describe 'horizon class' do # basic test for now, to make sure Apache serve /horizon dashboard if os[:family] == 'Debian' it 'executes curl and returns 200' do - shell('curl --connect-timeout 5 -sL -w "%{http_code} %{url_effective}\n" http://localhost/horizon -o /dev/null', :acceptable_exit_codes => [0]) do |r| + command('curl --connect-timeout 5 -sL -w "%{http_code} %{url_effective}\n" http://localhost/horizon -o /dev/null', :acceptable_exit_codes => [0]) do |r| expect(r.stdout).to match(/^200/) end end elsif os[:family] == 'RedHat' it 'executes curl and returns 200' do - shell('curl --connect-timeout 5 -sL -w "%{http_code} %{url_effective}\n" http://localhost/dashboard -o /dev/null', :acceptable_exit_codes => [0]) do |r| + command('curl --connect-timeout 5 -sL -w "%{http_code} %{url_effective}\n" http://localhost/dashboard -o /dev/null', :acceptable_exit_codes => [0]) do |r| expect(r.stdout).to match(/^200/) end end @@ -70,7 +70,7 @@ describe 'horizon class' do # basic test for now, to make sure Apache serve /horizon dashboard it 'executes curl and returns 200' do - shell('curl --connect-timeout 5 -sL -w "%{http_code} %{url_effective}\n" http://localhost -o /dev/null', :acceptable_exit_codes => [0]) do |r| + command('curl --connect-timeout 5 -sL -w "%{http_code} %{url_effective}\n" http://localhost -o /dev/null', :acceptable_exit_codes => [0]) do |r| expect(r.stdout).to match(/^200/) end end diff --git a/spec/acceptance/nodesets/centos-70-x64.yml b/spec/acceptance/nodesets/centos-70-x64.yml deleted file mode 100644 index 5f097e9f..00000000 --- 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 486b6a34..00000000 --- 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 ad73cc50..00000000 --- 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 c5528742..00000000 --- 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 4111da17..00000000 --- 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 9fc624e2..00000000 --- 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 99dd3187..00000000 --- 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 8001929b..00000000 --- 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 9196bc99..d51dfdbf 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'