From 8a264b759d8ded9e161366a7ec9249bab6d7f436 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 9 May 2021 22:27:55 +0100 Subject: [PATCH] ci: add `arch-master` to matrix and update `.travis.yml` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/323 --- .gitlab-ci.yml | 3 +- .travis.yml | 101 +++++++++++++++++++++++++++++-------------------- kitchen.yml | 4 ++ 3 files changed, 66 insertions(+), 42 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8c722fe..5f77e94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -148,6 +148,7 @@ default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} default-amazonlinux-2-master-py3: {extends: '.test_instance'} default-oraclelinux-8-master-py3: {extends: '.test_instance'} default-oraclelinux-7-master-py3: {extends: '.test_instance'} +default-arch-base-latest-master-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-debian-10-3003-0-py3: {extends: '.test_instance'} @@ -162,7 +163,7 @@ default-oraclelinux-7-master-py3: {extends: '.test_instance'} # default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} # default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} # default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} -default-arch-base-latest-3003-0-py3: {extends: '.test_instance'} +# default-arch-base-latest-3003-0-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'} # default-debian-10-3002-6-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index e3a8245..c52a36b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -122,6 +122,7 @@ jobs: - env: INSTANCE=default-ubuntu-1604-master-py3 - env: INSTANCE=default-centos-8-master-py3 - env: INSTANCE=default-centos-7-master-py3 + - env: INSTANCE=default-fedora-34-master-py3 - env: INSTANCE=default-fedora-33-master-py3 - env: INSTANCE=default-fedora-32-master-py3 - env: INSTANCE=default-opensuse-leap-152-master-py3 @@ -129,57 +130,75 @@ jobs: - env: INSTANCE=default-amazonlinux-2-master-py3 - env: INSTANCE=default-oraclelinux-8-master-py3 - env: INSTANCE=default-oraclelinux-7-master-py3 + - env: INSTANCE=default-arch-base-latest-master-py3 # - env: INSTANCE=default-gentoo-stage3-latest-master-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3 - # - env: INSTANCE=default-debian-10-3002-5-py3 - # - env: INSTANCE=default-debian-9-3002-5-py3 - # - env: INSTANCE=default-ubuntu-2004-3002-5-py3 - # - env: INSTANCE=default-ubuntu-1804-3002-5-py3 - # - env: INSTANCE=default-ubuntu-1604-3002-5-py3 - # - env: INSTANCE=default-centos-8-3002-5-py3 - # - env: INSTANCE=default-centos-7-3002-5-py3 - # - env: INSTANCE=default-fedora-33-3002-5-py3 - # - env: INSTANCE=default-fedora-32-3002-5-py3 - # - env: INSTANCE=default-amazonlinux-2-3002-5-py3 - # - env: INSTANCE=default-oraclelinux-8-3002-5-py3 - # - env: INSTANCE=default-oraclelinux-7-3002-5-py3 - - env: INSTANCE=default-arch-base-latest-3002-5-py3 + # - env: INSTANCE=default-debian-10-3003-0-py3 + # - env: INSTANCE=default-debian-9-3003-0-py3 + # - env: INSTANCE=default-ubuntu-2004-3003-0-py3 + # - env: INSTANCE=default-ubuntu-1804-3003-0-py3 + # - env: INSTANCE=default-centos-8-3003-0-py3 + # - env: INSTANCE=default-centos-7-3003-0-py3 + # - env: INSTANCE=default-fedora-34-3003-0-py3 + # - env: INSTANCE=default-fedora-33-3003-0-py3 + # - env: INSTANCE=default-fedora-32-3003-0-py3 + # - env: INSTANCE=default-amazonlinux-2-3003-0-py3 + # - env: INSTANCE=default-oraclelinux-8-3003-0-py3 + # - env: INSTANCE=default-oraclelinux-7-3003-0-py3 + # - env: INSTANCE=default-arch-base-latest-3003-0-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3003-0-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3003-0-py3 + # - env: INSTANCE=default-debian-10-3002-6-py3 + # - env: INSTANCE=default-debian-9-3002-6-py3 + # - env: INSTANCE=default-ubuntu-2004-3002-6-py3 + # - env: INSTANCE=default-ubuntu-1804-3002-6-py3 + # - env: INSTANCE=default-ubuntu-1604-3002-6-py3 + # - env: INSTANCE=default-centos-8-3002-6-py3 + # - env: INSTANCE=default-centos-7-3002-6-py3 + # - env: INSTANCE=default-fedora-34-3002-6-py3 + # - env: INSTANCE=default-fedora-33-3002-6-py3 + # - env: INSTANCE=default-fedora-32-3002-6-py3 + # - env: INSTANCE=default-amazonlinux-2-3002-6-py3 + # - env: INSTANCE=default-oraclelinux-8-3002-6-py3 + # - env: INSTANCE=default-oraclelinux-7-3002-6-py3 + # - env: INSTANCE=default-arch-base-latest-3002-6-py3 # - env: INSTANCE=default-gentoo-stage3-latest-3002-5-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-py3 # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3 - # - env: INSTANCE=default-debian-10-3001-6-py3 - # - env: INSTANCE=default-debian-9-3001-6-py3 - # - env: INSTANCE=default-ubuntu-2004-3001-6-py3 - # - env: INSTANCE=default-ubuntu-1804-3001-6-py3 - # - env: INSTANCE=default-ubuntu-1604-3001-6-py3 - # - env: INSTANCE=default-centos-8-3001-6-py3 - # - env: INSTANCE=default-centos-7-3001-6-py3 - # - env: INSTANCE=default-fedora-33-3001-6-py3 - # - env: INSTANCE=default-fedora-32-3001-6-py3 - # - env: INSTANCE=default-opensuse-leap-152-3001-6-py3 - # - env: INSTANCE=default-opensuse-tmbl-latest-3001-6-py3 - # - env: INSTANCE=default-amazonlinux-2-3001-6-py3 - # - env: INSTANCE=default-oraclelinux-8-3001-6-py3 - # - env: INSTANCE=default-oraclelinux-7-3001-6-py3 - # - env: INSTANCE=default-arch-base-latest-3001-6-py3 + # - env: INSTANCE=default-debian-10-3001-7-py3 + # - env: INSTANCE=default-debian-9-3001-7-py3 + # - env: INSTANCE=default-ubuntu-2004-3001-7-py3 + # - env: INSTANCE=default-ubuntu-1804-3001-7-py3 + # - env: INSTANCE=default-ubuntu-1604-3001-7-py3 + # - env: INSTANCE=default-centos-8-3001-7-py3 + # - env: INSTANCE=default-centos-7-3001-7-py3 + # - env: INSTANCE=default-fedora-34-3001-7-py3 + # - env: INSTANCE=default-fedora-33-3001-7-py3 + # - env: INSTANCE=default-fedora-32-3001-7-py3 + # - env: INSTANCE=default-opensuse-leap-152-3001-7-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3 + # - env: INSTANCE=default-amazonlinux-2-3001-7-py3 + # - env: INSTANCE=default-oraclelinux-8-3001-7-py3 + # - env: INSTANCE=default-oraclelinux-7-3001-7-py3 + # - env: INSTANCE=default-arch-base-latest-3001-7-py3 # - env: INSTANCE=default-gentoo-stage3-latest-3001-6-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3001-6-py3 - # - env: INSTANCE=default-debian-10-3000-8-py3 - # - env: INSTANCE=default-debian-9-3000-8-py3 - # - env: INSTANCE=default-ubuntu-1804-3000-8-py3 - # - env: INSTANCE=default-ubuntu-1604-3000-8-py3 - # - env: INSTANCE=default-centos-8-3000-8-py3 - # - env: INSTANCE=default-centos-7-3000-8-py3 - # - env: INSTANCE=default-opensuse-leap-152-3000-8-py3 - # - env: INSTANCE=default-amazonlinux-2-3000-8-py3 - # - env: INSTANCE=default-oraclelinux-8-3000-8-py3 - # - env: INSTANCE=default-oraclelinux-7-3000-8-py3 + # - env: INSTANCE=default-debian-10-3000-9-py3 + # - env: INSTANCE=default-debian-9-3000-9-py3 + # - env: INSTANCE=default-ubuntu-1804-3000-9-py3 + # - env: INSTANCE=default-ubuntu-1604-3000-9-py3 + # - env: INSTANCE=default-centos-8-3000-9-py3 + # - env: INSTANCE=default-centos-7-3000-9-py3 + # - env: INSTANCE=default-opensuse-leap-152-3000-9-py3 + # - env: INSTANCE=default-amazonlinux-2-3000-9-py3 + # - env: INSTANCE=default-oraclelinux-8-3000-9-py3 + # - env: INSTANCE=default-oraclelinux-7-3000-9-py3 + # - env: INSTANCE=default-ubuntu-1804-3000-9-py2 + # - env: INSTANCE=default-ubuntu-1604-3000-9-py2 + # - env: INSTANCE=default-arch-base-latest-3000-9-py2 # - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3 - # - env: INSTANCE=default-ubuntu-1804-3000-8-py2 - # - env: INSTANCE=default-ubuntu-1604-3000-8-py2 - # - env: INSTANCE=default-arch-base-latest-3000-8-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index 3033d6f..638b450 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -97,6 +97,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