Skip to content

Commit

Permalink
ci(3003.1): update inc. AlmaLinux, Rocky & rst-lint [skip ci]
Browse files Browse the repository at this point in the history 
* Automated using myii/ssf-formula#335
  • Loading branch information
@myii
myii committed Jul 1, 2021
1 parent f044bcb commit f80da8c
Show file tree
Hide file tree
Showing 10 changed files with 201 additions and 92 deletions.
54 changes: 34 additions & 20 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ rubocop:
# prod-server-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
# prod-server-almalinux-8-tiamat-py3: {extends: '.test_instance'}
# prod-server-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
# prod-server-debian-10-master-py3: {extends: '.test_instance'}
debian-10-master-py3: {extends: '.test_instance'}
# prod-server-debian-9-master-py3: {extends: '.test_instance'}
Expand All @@ -148,6 +150,8 @@ centos-7-master-py3: {extends: '.test_instance'}
# fedora-34-master-py3: {extends: '.test_instance'}
# prod-server-fedora-33-master-py3: {extends: '.test_instance'}
# fedora-33-master-py3: {extends: '.test_instance'}
# prod-server-opensuse-leap-153-master-py3: {extends: '.test_instance'}
opensuse-leap-153-master-py3: {extends: '.test_instance'}
# prod-server-opensuse-leap-152-master-py3: {extends: '.test_instance'}
opensuse-leap-152-master-py3: {extends: '.test_instance'}
# prod-server-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
Expand All @@ -164,20 +168,27 @@ arch-base-latest-master-py3: {extends: '.test_instance'}
# gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
# gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
# prod-server-debian-10-3003-0-py3: {extends: '.test_instance'}
# prod-server-debian-9-3003-0-py3: {extends: '.test_instance'}
# prod-server-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
# prod-server-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
# prod-server-centos-8-3003-0-py3: {extends: '.test_instance'}
# prod-server-centos-7-3003-0-py3: {extends: '.test_instance'}
# prod-server-fedora-34-3003-0-py3: {extends: '.test_instance'}
# prod-server-fedora-33-3003-0-py3: {extends: '.test_instance'}
# prod-server-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
# prod-server-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'}
# prod-server-almalinux-8-master-py3: {extends: '.test_instance'}
almalinux-8-master-py3: {extends: '.test_instance'}
# prod-server-rockylinux-8-master-py3: {extends: '.test_instance'}
rockylinux-8-master-py3: {extends: '.test_instance'}
# prod-server-debian-10-3003-1-py3: {extends: '.test_instance'}
# prod-server-debian-9-3003-1-py3: {extends: '.test_instance'}
# prod-server-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
# prod-server-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
# prod-server-centos-8-3003-1-py3: {extends: '.test_instance'}
# prod-server-centos-7-3003-1-py3: {extends: '.test_instance'}
# prod-server-fedora-34-3003-1-py3: {extends: '.test_instance'}
# prod-server-fedora-33-3003-1-py3: {extends: '.test_instance'}
# prod-server-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
# prod-server-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
# prod-server-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
# prod-server-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
# prod-server-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
# prod-server-debian-10-3002-6-py3: {extends: '.test_instance'}
# prod-server-debian-9-3002-6-py3: {extends: '.test_instance'}
# prod-server-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
Expand All @@ -190,8 +201,9 @@ arch-base-latest-master-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
# prod-server-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'}
# prod-server-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
# prod-server-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
# prod-server-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
# prod-server-debian-10-3001-7-py3: {extends: '.test_instance'}
Expand All @@ -202,27 +214,29 @@ arch-base-latest-master-py3: {extends: '.test_instance'}
# prod-server-centos-7-3001-7-py3: {extends: '.test_instance'}
# prod-server-fedora-34-3001-7-py3: {extends: '.test_instance'}
# prod-server-fedora-33-3001-7-py3: {extends: '.test_instance'}
# prod-server-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
# prod-server-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
# prod-server-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
# prod-server-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
# prod-server-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'}
# prod-server-debian-10-3000-9-py3: {extends: '.test_instance'}
# prod-server-debian-9-3000-9-py3: {extends: '.test_instance'}
# prod-server-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
# prod-server-centos-8-3000-9-py3: {extends: '.test_instance'}
# prod-server-centos-7-3000-9-py3: {extends: '.test_instance'}
# prod-server-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
# prod-server-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
# prod-server-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
# prod-server-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'}
# prod-server-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
# prod-server-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
# prod-server-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
# prod-server-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}

###############################################################################
# `release` stage: `semantic-release`
Expand Down
11 changes: 11 additions & 0 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,14 @@ repos:
- id: rstcheck
name: Check reST files using rstcheck
exclude: 'docs/CHANGELOG.rst'
- repo: https://github.com/saltstack-formulas/mirrors-rst-lint
rev: v1.3.2
hooks:
- id: rst-lint
name: Check reST files using rst-lint
exclude: |
(?x)^(
docs/CHANGELOG.rst|
docs/TOFS_pattern.rst|
)$
additional_dependencies: [pygments==2.9.0]
54 changes: 34 additions & 20 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ jobs:
# - env: INSTANCE=prod-server-amazonlinux-2-tiamat-py3
# - env: INSTANCE=prod-server-oraclelinux-8-tiamat-py3
# - env: INSTANCE=prod-server-oraclelinux-7-tiamat-py3
# - env: INSTANCE=prod-server-almalinux-8-tiamat-py3
# - env: INSTANCE=prod-server-rockylinux-8-tiamat-py3
# - env: INSTANCE=prod-server-debian-10-master-py3
- env: INSTANCE=debian-10-master-py3
# - env: INSTANCE=prod-server-debian-9-master-py3
Expand All @@ -108,6 +110,8 @@ jobs:
# - env: INSTANCE=fedora-34-master-py3
# - env: INSTANCE=prod-server-fedora-33-master-py3
# - env: INSTANCE=fedora-33-master-py3
# - env: INSTANCE=prod-server-opensuse-leap-153-master-py3
- env: INSTANCE=opensuse-leap-153-master-py3
# - env: INSTANCE=prod-server-opensuse-leap-152-master-py3
- env: INSTANCE=opensuse-leap-152-master-py3
# - env: INSTANCE=prod-server-opensuse-tmbl-latest-master-py3
Expand All @@ -124,20 +128,27 @@ jobs:
# - env: INSTANCE=gentoo-stage3-latest-master-py3
# - env: INSTANCE=prod-server-gentoo-stage3-systemd-master-py3
# - env: INSTANCE=gentoo-stage3-systemd-master-py3
# - env: INSTANCE=prod-server-debian-10-3003-0-py3
# - env: INSTANCE=prod-server-debian-9-3003-0-py3
# - env: INSTANCE=prod-server-ubuntu-2004-3003-0-py3
# - env: INSTANCE=prod-server-ubuntu-1804-3003-0-py3
# - env: INSTANCE=prod-server-centos-8-3003-0-py3
# - env: INSTANCE=prod-server-centos-7-3003-0-py3
# - env: INSTANCE=prod-server-fedora-34-3003-0-py3
# - env: INSTANCE=prod-server-fedora-33-3003-0-py3
# - env: INSTANCE=prod-server-amazonlinux-2-3003-0-py3
# - env: INSTANCE=prod-server-oraclelinux-8-3003-0-py3
# - env: INSTANCE=prod-server-oraclelinux-7-3003-0-py3
# - env: INSTANCE=prod-server-arch-base-latest-3003-0-py3
# - env: INSTANCE=prod-server-gentoo-stage3-latest-3003-0-py3
# - env: INSTANCE=prod-server-gentoo-stage3-systemd-3003-0-py3
# - env: INSTANCE=prod-server-almalinux-8-master-py3
- env: INSTANCE=almalinux-8-master-py3
# - env: INSTANCE=prod-server-rockylinux-8-master-py3
- env: INSTANCE=rockylinux-8-master-py3
# - env: INSTANCE=prod-server-debian-10-3003-1-py3
# - env: INSTANCE=prod-server-debian-9-3003-1-py3
# - env: INSTANCE=prod-server-ubuntu-2004-3003-1-py3
# - env: INSTANCE=prod-server-ubuntu-1804-3003-1-py3
# - env: INSTANCE=prod-server-centos-8-3003-1-py3
# - env: INSTANCE=prod-server-centos-7-3003-1-py3
# - env: INSTANCE=prod-server-fedora-34-3003-1-py3
# - env: INSTANCE=prod-server-fedora-33-3003-1-py3
# - env: INSTANCE=prod-server-opensuse-leap-153-3003-1-py3
# - env: INSTANCE=prod-server-opensuse-leap-152-3003-1-py3
# - env: INSTANCE=prod-server-opensuse-tmbl-latest-3003-1-py3
# - env: INSTANCE=prod-server-amazonlinux-2-3003-1-py3
# - env: INSTANCE=prod-server-oraclelinux-8-3003-1-py3
# - env: INSTANCE=prod-server-oraclelinux-7-3003-1-py3
# - env: INSTANCE=prod-server-arch-base-latest-3003-1-py3
# - env: INSTANCE=prod-server-gentoo-stage3-latest-3003-1-py3
# - env: INSTANCE=prod-server-gentoo-stage3-systemd-3003-1-py3
# - env: INSTANCE=prod-server-debian-10-3002-6-py3
# - env: INSTANCE=prod-server-debian-9-3002-6-py3
# - env: INSTANCE=prod-server-ubuntu-2004-3002-6-py3
Expand All @@ -150,8 +161,9 @@ jobs:
# - env: INSTANCE=prod-server-oraclelinux-8-3002-6-py3
# - env: INSTANCE=prod-server-oraclelinux-7-3002-6-py3
# - env: INSTANCE=prod-server-arch-base-latest-3002-6-py3
# - env: INSTANCE=prod-server-gentoo-stage3-latest-3002-5-py3
# - env: INSTANCE=prod-server-gentoo-stage3-systemd-3002-5-py3
# - env: INSTANCE=prod-server-gentoo-stage3-latest-3002-6-py3
# - env: INSTANCE=prod-server-gentoo-stage3-systemd-3002-6-py3
# - env: INSTANCE=prod-server-opensuse-leap-153-3002-2-py3
# - env: INSTANCE=prod-server-opensuse-leap-152-3002-2-py3
# - env: INSTANCE=prod-server-opensuse-tmbl-latest-3002-2-py3
# - env: INSTANCE=prod-server-debian-10-3001-7-py3
Expand All @@ -162,27 +174,29 @@ jobs:
# - env: INSTANCE=prod-server-centos-7-3001-7-py3
# - env: INSTANCE=prod-server-fedora-34-3001-7-py3
# - env: INSTANCE=prod-server-fedora-33-3001-7-py3
# - env: INSTANCE=prod-server-opensuse-leap-153-3001-7-py3
# - env: INSTANCE=prod-server-opensuse-leap-152-3001-7-py3
# - env: INSTANCE=prod-server-opensuse-tmbl-latest-3001-7-py3
# - env: INSTANCE=prod-server-amazonlinux-2-3001-7-py3
# - env: INSTANCE=prod-server-oraclelinux-8-3001-7-py3
# - env: INSTANCE=prod-server-oraclelinux-7-3001-7-py3
# - env: INSTANCE=prod-server-arch-base-latest-3001-7-py3
# - env: INSTANCE=prod-server-gentoo-stage3-latest-3001-6-py3
# - env: INSTANCE=prod-server-gentoo-stage3-systemd-3001-6-py3
# - env: INSTANCE=prod-server-gentoo-stage3-latest-3001-7-py3
# - env: INSTANCE=prod-server-gentoo-stage3-systemd-3001-7-py3
# - env: INSTANCE=prod-server-debian-10-3000-9-py3
# - env: INSTANCE=prod-server-debian-9-3000-9-py3
# - env: INSTANCE=prod-server-ubuntu-1804-3000-9-py3
# - env: INSTANCE=prod-server-centos-8-3000-9-py3
# - env: INSTANCE=prod-server-centos-7-3000-9-py3
# - env: INSTANCE=prod-server-opensuse-leap-153-3000-9-py3
# - env: INSTANCE=prod-server-opensuse-leap-152-3000-9-py3
# - env: INSTANCE=prod-server-amazonlinux-2-3000-9-py3
# - env: INSTANCE=prod-server-oraclelinux-8-3000-9-py3
# - env: INSTANCE=prod-server-oraclelinux-7-3000-9-py3
# - env: INSTANCE=prod-server-gentoo-stage3-latest-3000-9-py3
# - env: INSTANCE=prod-server-gentoo-stage3-systemd-3000-9-py3
# - env: INSTANCE=prod-server-ubuntu-1804-3000-9-py2
# - env: INSTANCE=prod-server-arch-base-latest-3000-9-py2
# - env: INSTANCE=prod-server-gentoo-stage3-latest-3000-8-py3
# - env: INSTANCE=prod-server-gentoo-stage3-systemd-3000-8-py3

## Define the release stage that runs `semantic-release`
- stage: 'release'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37
revision: 1f543f654da5c1774cb8737f6f07a01745520bb5
branch: ssf
specs:
kitchen-docker (2.10.0)
Expand Down
Loading

0 comments on commit f80da8c

Please sign in to comment.