From 7c15f3039fa473a416997dc6ef88773a0a361db8 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 29 Jun 2016 14:41:22 -0600 Subject: [PATCH] Rework os check This change updates the way we do the os check to use the os facts rather than running facter via beaker. Change-Id: Iaee0ad6252b44ad2e2b5e6478957084c5aa18c05 --- spec/acceptance/nodesets/ubuntu-server-1604-x64.yml | 11 +++++++++++ spec/acceptance/openstack_extras_repo_spec.rb | 5 ++--- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 spec/acceptance/nodesets/ubuntu-server-1604-x64.yml diff --git a/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml new file mode 100644 index 0000000..4e3e676 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml @@ -0,0 +1,11 @@ +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 5534c0c..3e2bae2 100644 --- a/spec/acceptance/openstack_extras_repo_spec.rb +++ b/spec/acceptance/openstack_extras_repo_spec.rb @@ -18,11 +18,10 @@ describe 'openstack_extras::repo::*' do end it 'should be able to install openstack packages' do - case fact('osfamily') - when 'Debian' + 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}/) - when 'Redhat' + 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/) end