From 905d85bf47b107ccd45c25b2e469c5fa6814381b Mon Sep 17 00:00:00 2001 From: N Date: Mon, 1 Jul 2019 00:48:05 +0100 Subject: [PATCH] fix(redhat): correct python rados package; update kitchen --- deepsea/osfingermap.yaml | 11 +++++++++-- kitchen.yml | 2 ++ test/integration/default/controls/services_spec.rb | 4 ---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/deepsea/osfingermap.yaml b/deepsea/osfingermap.yaml index 761b188..6ef397e 100644 --- a/deepsea/osfingermap.yaml +++ b/deepsea/osfingermap.yaml @@ -11,8 +11,15 @@ # osfingermap: {} --- # os: Debian -Debian-9: {} -Debian-8: {} +Debian-9: + pkg: + deps: + - python-rados + +Debian-8: + pkg: + deps: + - python-rados # os: CentOS CentOS-7: diff --git a/kitchen.yml b/kitchen.yml index 443bb12..e083b02 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -29,11 +29,13 @@ platforms: image: netmanagers/salt-develop-py3:centos-7 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - yum install make -y - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - name: fedora-29-develop-py3 driver: image: netmanagers/salt-develop-py3:fedora-29 provision_command: + - yum install make -y - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - name: opensuse-leap-15-develop-py3 diff --git a/test/integration/default/controls/services_spec.rb b/test/integration/default/controls/services_spec.rb index e0fd8ce..7f45bc7 100644 --- a/test/integration/default/controls/services_spec.rb +++ b/test/integration/default/controls/services_spec.rb @@ -7,8 +7,4 @@ it { should be_running } end - describe command('service salt-minion status') do - its('stdout') { should match 'running' } - its('exit_status') { should eq 0 } - end end