ci: add arch-master to matrix and update .travis.yml [skip ci]

* Automated using myii/ssf-formula#323
saltstack-formulas · May 9, 2021 · 931d4b5 · 931d4b5
1 parent 5dc24b1
commit 931d4b5
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 42 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -148,6 +148,7 @@ suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
 amazon-amazonlinux-2-master-py3: {extends: '.test_instance'}
 redhat8-oraclelinux-8-master-py3: {extends: '.test_instance'}
 centos-oraclelinux-7-master-py3: {extends: '.test_instance'}
+arch-arch-base-latest-master-py3: {extends: '.test_instance'}
 gentoo-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
 gentoo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # debian-debian-10-3003-0-py3: {extends: '.test_instance'}
@@ -162,7 +163,7 @@ gentoo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # amazon-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
 # redhat8-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
 # centos-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
-arch-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
+# arch-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
 # gentoo-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'}
 # gentoo-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'}
 # debian-debian-10-3002-6-py3: {extends: '.test_instance'}

diff --git a/.travis.yml b/.travis.yml
@@ -100,64 +100,83 @@ jobs:
     # - env: INSTANCE=ubuntu-ubuntu-1604-master-py3
     - env: INSTANCE=redhat8-centos-8-master-py3
     - env: INSTANCE=centos-centos-7-master-py3
+    # - env: INSTANCE=fedora-fedora-34-master-py3
     # - env: INSTANCE=fedora-fedora-33-master-py3
     - env: INSTANCE=fedora-fedora-32-master-py3
     - env: INSTANCE=suse-opensuse-leap-152-master-py3
     - env: INSTANCE=suse-opensuse-tmbl-latest-master-py3
     - env: INSTANCE=amazon-amazonlinux-2-master-py3
     - env: INSTANCE=redhat8-oraclelinux-8-master-py3
     - env: INSTANCE=centos-oraclelinux-7-master-py3
+    - env: INSTANCE=arch-arch-base-latest-master-py3
     - env: INSTANCE=gentoo-gentoo-stage3-latest-master-py3
     - env: INSTANCE=gentoo-gentoo-stage3-systemd-master-py3
-    # - env: INSTANCE=debian-debian-10-3002-5-py3
-    # - env: INSTANCE=debian-debian-9-3002-5-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2004-3002-5-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-3002-5-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1604-3002-5-py3
-    # - env: INSTANCE=redhat8-centos-8-3002-5-py3
-    # - env: INSTANCE=centos-centos-7-3002-5-py3
-    # - env: INSTANCE=fedora-fedora-33-3002-5-py3
-    # - env: INSTANCE=fedora-fedora-32-3002-5-py3
-    # - env: INSTANCE=amazon-amazonlinux-2-3002-5-py3
-    # - env: INSTANCE=redhat8-oraclelinux-8-3002-5-py3
-    # - env: INSTANCE=centos-oraclelinux-7-3002-5-py3
-    - env: INSTANCE=arch-arch-base-latest-3002-5-py3
+    # - env: INSTANCE=debian-debian-10-3003-0-py3
+    # - env: INSTANCE=debian-debian-9-3003-0-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3003-0-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3003-0-py3
+    # - env: INSTANCE=redhat8-centos-8-3003-0-py3
+    # - env: INSTANCE=centos-centos-7-3003-0-py3
+    # - env: INSTANCE=fedora-fedora-34-3003-0-py3
+    # - env: INSTANCE=fedora-fedora-33-3003-0-py3
+    # - env: INSTANCE=fedora-fedora-32-3003-0-py3
+    # - env: INSTANCE=amazon-amazonlinux-2-3003-0-py3
+    # - env: INSTANCE=redhat8-oraclelinux-8-3003-0-py3
+    # - env: INSTANCE=centos-oraclelinux-7-3003-0-py3
+    # - env: INSTANCE=arch-arch-base-latest-3003-0-py3
+    # - env: INSTANCE=gentoo-gentoo-stage3-latest-3003-0-py3
+    # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3003-0-py3
+    # - env: INSTANCE=debian-debian-10-3002-6-py3
+    # - env: INSTANCE=debian-debian-9-3002-6-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3002-6-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3002-6-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1604-3002-6-py3
+    # - env: INSTANCE=redhat8-centos-8-3002-6-py3
+    # - env: INSTANCE=centos-centos-7-3002-6-py3
+    # - env: INSTANCE=fedora-fedora-34-3002-6-py3
+    # - env: INSTANCE=fedora-fedora-33-3002-6-py3
+    # - env: INSTANCE=fedora-fedora-32-3002-6-py3
+    # - env: INSTANCE=amazon-amazonlinux-2-3002-6-py3
+    # - env: INSTANCE=redhat8-oraclelinux-8-3002-6-py3
+    # - env: INSTANCE=centos-oraclelinux-7-3002-6-py3
+    # - env: INSTANCE=arch-arch-base-latest-3002-6-py3
     # - env: INSTANCE=gentoo-gentoo-stage3-latest-3002-5-py3
     # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3002-5-py3
     # - env: INSTANCE=suse-opensuse-leap-152-3002-2-py3
     # - env: INSTANCE=suse-opensuse-tmbl-latest-3002-2-py3
-    # - env: INSTANCE=debian-debian-10-3001-6-py3
-    # - env: INSTANCE=debian-debian-9-3001-6-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2004-3001-6-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-3001-6-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1604-3001-6-py3
-    # - env: INSTANCE=redhat8-centos-8-3001-6-py3
-    # - env: INSTANCE=centos-centos-7-3001-6-py3
-    # - env: INSTANCE=fedora-fedora-33-3001-6-py3
-    # - env: INSTANCE=fedora-fedora-32-3001-6-py3
-    # - env: INSTANCE=suse-opensuse-leap-152-3001-6-py3
-    # - env: INSTANCE=suse-opensuse-tmbl-latest-3001-6-py3
-    # - env: INSTANCE=amazon-amazonlinux-2-3001-6-py3
-    # - env: INSTANCE=redhat8-oraclelinux-8-3001-6-py3
-    # - env: INSTANCE=centos-oraclelinux-7-3001-6-py3
-    # - env: INSTANCE=arch-arch-base-latest-3001-6-py3
+    # - env: INSTANCE=debian-debian-10-3001-7-py3
+    # - env: INSTANCE=debian-debian-9-3001-7-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3001-7-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3001-7-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1604-3001-7-py3
+    # - env: INSTANCE=redhat8-centos-8-3001-7-py3
+    # - env: INSTANCE=centos-centos-7-3001-7-py3
+    # - env: INSTANCE=fedora-fedora-34-3001-7-py3
+    # - env: INSTANCE=fedora-fedora-33-3001-7-py3
+    # - env: INSTANCE=fedora-fedora-32-3001-7-py3
+    # - env: INSTANCE=suse-opensuse-leap-152-3001-7-py3
+    # - env: INSTANCE=suse-opensuse-tmbl-latest-3001-7-py3
+    # - env: INSTANCE=amazon-amazonlinux-2-3001-7-py3
+    # - env: INSTANCE=redhat8-oraclelinux-8-3001-7-py3
+    # - env: INSTANCE=centos-oraclelinux-7-3001-7-py3
+    # - env: INSTANCE=arch-arch-base-latest-3001-7-py3
     # - env: INSTANCE=gentoo-gentoo-stage3-latest-3001-6-py3
     # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3001-6-py3
-    # - env: INSTANCE=debian-debian-10-3000-8-py3
-    # - env: INSTANCE=debian-debian-9-3000-8-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-3000-8-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1604-3000-8-py3
-    # - env: INSTANCE=redhat8-centos-8-3000-8-py3
-    # - env: INSTANCE=centos-centos-7-3000-8-py3
-    # - env: INSTANCE=suse-opensuse-leap-152-3000-8-py3
-    # - env: INSTANCE=amazon-amazonlinux-2-3000-8-py3
-    # - env: INSTANCE=redhat8-oraclelinux-8-3000-8-py3
-    # - env: INSTANCE=centos-oraclelinux-7-3000-8-py3
+    # - env: INSTANCE=debian-debian-10-3000-9-py3
+    # - env: INSTANCE=debian-debian-9-3000-9-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3000-9-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1604-3000-9-py3
+    # - env: INSTANCE=redhat8-centos-8-3000-9-py3
+    # - env: INSTANCE=centos-centos-7-3000-9-py3
+    # - env: INSTANCE=suse-opensuse-leap-152-3000-9-py3
+    # - env: INSTANCE=amazon-amazonlinux-2-3000-9-py3
+    # - env: INSTANCE=redhat8-oraclelinux-8-3000-9-py3
+    # - env: INSTANCE=centos-oraclelinux-7-3000-9-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3000-9-py2
+    # - env: INSTANCE=ubuntu-ubuntu-1604-3000-9-py2
+    # - env: INSTANCE=arch-arch-base-latest-3000-9-py2
     # - env: INSTANCE=gentoo-gentoo-stage3-latest-3000-8-py3
     # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3000-8-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-3000-8-py2
-    # - env: INSTANCE=ubuntu-ubuntu-1604-3000-8-py2
-    # - env: INSTANCE=arch-arch-base-latest-3000-8-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

diff --git a/kitchen.yml b/kitchen.yml
@@ -113,6 +113,10 @@ platforms:
   - name: oraclelinux-7-master-py3
     driver:
       image: saltimages/salt-master-py3:oraclelinux-7
+  - name: arch-base-latest-master-py3
+    driver:
+      image: saltimages/salt-master-py3:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
   - name: gentoo-stage3-latest-master-py3
     driver:
       image: saltimages/salt-master-py3:gentoo-stage3-latest
@@ -651,6 +655,7 @@ suites:
         - path: test/integration/default
   - name: arch
     includes:
+      - arch-base-latest-master-py3
       - arch-base-latest-3003-0-py3
       - arch-base-latest-3002-6-py3
       - arch-base-latest-3001-7-py3