ci: workaround issues with newly introduced amazonlinux-1 [skip ci]

* Automated using myii/ssf-formula#127
saltstack-formulas · Feb 12, 2020 · a7fe651 · a7fe651
1 parent 6c4e811
commit a7fe651
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -70,21 +70,19 @@ jobs:
     # - env: INSTANCE=default-centos-8-2019-2-py3
     # - env: INSTANCE=default-fedora-31-2019-2-py3
     - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
-    # - env: INSTANCE=default-amazonlinux-2-2019-2-py3
+    - env: INSTANCE=default-amazonlinux-2-2019-2-py3
     # - env: INSTANCE=default-centos-7-2019-2-py2
     # - env: INSTANCE=default-arch-base-latest-2019-2-py2
     - env: INSTANCE=default-fedora-30-2018-3-py3
     # - env: INSTANCE=default-debian-9-2018-3-py2
     # - env: INSTANCE=default-ubuntu-1604-2018-3-py2
     # - env: INSTANCE=default-centos-7-2018-3-py2
     # - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
-    # - env: INSTANCE=default-amazonlinux-1-2018-3-py2
     - env: INSTANCE=default-arch-base-latest-2018-3-py2
     # - env: INSTANCE=default-debian-8-2017-7-py2
     # - env: INSTANCE=default-ubuntu-1604-2017-7-py2
     # - env: INSTANCE=default-fedora-30-2017-7-py2
     # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2
-    - env: INSTANCE=default-amazonlinux-1-2017-7-py2
     # - env: INSTANCE=default-arch-base-latest-2017-7-py2
 
     ## Define the release stage that runs `semantic-release`

diff --git a/kitchen.yml b/kitchen.yml
@@ -93,10 +93,6 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-1-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:amazonlinux-1
-      run_command: /sbin/init
   - name: arch-base-latest-2018-3-py2
     driver:
       image: netmanagers/salt-2018.3-py2:arch-base-latest
@@ -120,10 +116,6 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-1-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:amazonlinux-1
-      run_command: /sbin/init
   - name: arch-base-latest-2017-7-py2
     driver:
       image: netmanagers/salt-2017.7-py2:arch-base-latest