test(fixes): fix two kitchen test failures

saltstack-formulas · Jun 23, 2019 · b01a5d4 · b01a5d4
1 parent 3bd6a83
commit b01a5d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/kitchen.yml b/kitchen.yml
@@ -18,12 +18,16 @@ platforms:
       provision_command:
         - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
         - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
+        # https://github.com/saltstack/salt/issues/39314
+        - apt-get remove python-boto3 -y
   - name: ubuntu-1804-develop-py3
     driver:
       image: netmanagers/salt-develop-py3:ubuntu-18.04
       provision_command:
         - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
         - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
+        # https://github.com/saltstack/salt/issues/39314
+        - apt-get remove python-boto3 -y
   - name: centos-7-develop-py3
     driver:
       image: netmanagers/salt-develop-py3:centos-7
@@ -42,6 +46,8 @@ platforms:
       provision_command:
         - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
         - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
+        # https://github.com/saltstack/salt/issues/39314
+        - zypper rm python-boto3 -y
       run_command: /usr/lib/systemd/systemd
 
   ## SALT 2019.2

diff --git a/...ion/default/controls/alternatives_spec.rb → ...gration/default/todo/alternatives_spec.rb b/...ion/default/controls/alternatives_spec.rb → ...gration/default/todo/alternatives_spec.rb