From 1d57c4e2c80b6cb21f575dc3a5eae0090c365e26 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Mon, 31 Aug 2020 21:45:11 +0200 Subject: [PATCH] Add Puppet Litmus Depends-On: https://review.opendev.org/#/c/740601/ Change-Id: Iff4fafb66878ce3273516e7c3ba046a844a9d09a --- .zuul.yaml | 2 +- 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 ---------- spec/acceptance/nodesets/ubuntu-server-1404-x64.yml | 11 ----------- spec/acceptance/nodesets/ubuntu-server-1604-x64.yml | 11 ----------- spec/acceptance/openstack_extras_repo_spec.rb | 8 ++++---- spec/spec_helper_acceptance.rb | 2 +- 12 files changed, 6 insertions(+), 99 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 delete mode 100644 spec/acceptance/nodesets/ubuntu-server-1604-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/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/acceptance/nodesets/ubuntu-server-1604-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml deleted file mode 100644 index 4e3e676..0000000 --- a/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml +++ /dev/null @@ -1,11 +0,0 @@ -HOSTS: - ubuntu-server-16.04-amd64: - roles: - - master - platform: ubuntu-16.04-amd64 - box: puppetlabs/ubuntu-16.04-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/ubuntu-16.04-64-nocm - hypervisor: vagrant -CONFIG: - log_level: debug - type: foss diff --git a/spec/acceptance/openstack_extras_repo_spec.rb b/spec/acceptance/openstack_extras_repo_spec.rb index 46558a8..e91270a 100644 --- a/spec/acceptance/openstack_extras_repo_spec.rb +++ b/spec/acceptance/openstack_extras_repo_spec.rb @@ -19,11 +19,11 @@ describe 'openstack_extras::repo::*' do it 'should be able to install openstack packages' do if os[:family] == 'Debian' - expect(shell('apt-get install -y python-openstackclient').exit_code).to be_zero - expect(shell('apt-cache policy python-openstackclient | grep -A 1 \*\*\*').stdout).to match(/#{release}/) + expect(command('apt-get install -y python-openstackclient').exit_code).to be_zero + expect(command('apt-cache policy python-openstackclient | grep -A 1 \*\*\*').stdout).to match(/#{release}/) elsif os[:family] == 'RedHat' - expect(shell('yum install -y python-openstackclient').exit_code).to be_zero - expect(shell('yum list python-openstackclient | grep -A 1 "Installed Packages"').stdout).to match(/@rdo-release/) + expect(command('yum install -y python-openstackclient').exit_code).to be_zero + expect(command('yum list python-openstackclient | grep -A 1 "Installed Packages"').stdout).to match(/@rdo-release/) end end end 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'