From 324472cde485b0678ba7cc18526fcd5de7dd66ec Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 2 Jul 2021 00:00:41 +0100 Subject: [PATCH] ci(3003.1): update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/335 --- .gitlab-ci.yml | 14 +++++---- .pre-commit-config.yaml | 11 +++++++ .travis.yml | 14 +++++---- Gemfile.lock | 2 +- kitchen.yml | 34 +++++++++++++++------- test/integration/default/inspec.yml | 2 ++ test/integration/share/inspec.yml | 2 ++ test/integration/share/libraries/system.rb | 2 +- 8 files changed, 58 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c90841..644c2bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -128,16 +128,20 @@ rubocop: # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} # default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'} # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'} +# default-almalinux-8-tiamat-py3: {extends: '.test_instance'} +# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'} default-centos-8-master-py3: {extends: '.test_instance'} default-centos-7-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-centos-8-3003-0-py3: {extends: '.test_instance'} -# default-centos-7-3003-0-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-almalinux-8-master-py3: {extends: '.test_instance'} +default-rockylinux-8-master-py3: {extends: '.test_instance'} +# default-centos-8-3003-1-py3: {extends: '.test_instance'} +# default-centos-7-3003-1-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3003-1-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3003-1-py3: {extends: '.test_instance'} # default-centos-8-3002-6-py3: {extends: '.test_instance'} # default-centos-7-3002-6-py3: {extends: '.test_instance'} # default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9bc4109..41b5f35 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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] diff --git a/.travis.yml b/.travis.yml index d4aed33..b94c7ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,16 +88,20 @@ jobs: # - env: INSTANCE=default-amazonlinux-2-tiamat-py3 # - env: INSTANCE=default-oraclelinux-8-tiamat-py3 # - env: INSTANCE=default-oraclelinux-7-tiamat-py3 + # - env: INSTANCE=default-almalinux-8-tiamat-py3 + # - env: INSTANCE=default-rockylinux-8-tiamat-py3 - env: INSTANCE=default-centos-8-master-py3 - env: INSTANCE=default-centos-7-master-py3 - env: INSTANCE=default-amazonlinux-2-master-py3 - env: INSTANCE=default-oraclelinux-8-master-py3 - env: INSTANCE=default-oraclelinux-7-master-py3 - # - env: INSTANCE=default-centos-8-3003-0-py3 - # - env: INSTANCE=default-centos-7-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-almalinux-8-master-py3 + - env: INSTANCE=default-rockylinux-8-master-py3 + # - env: INSTANCE=default-centos-8-3003-1-py3 + # - env: INSTANCE=default-centos-7-3003-1-py3 + # - env: INSTANCE=default-amazonlinux-2-3003-1-py3 + # - env: INSTANCE=default-oraclelinux-8-3003-1-py3 + # - env: INSTANCE=default-oraclelinux-7-3003-1-py3 # - env: INSTANCE=default-centos-8-3002-6-py3 # - env: INSTANCE=default-centos-7-3002-6-py3 # - env: INSTANCE=default-amazonlinux-2-3002-6-py3 diff --git a/Gemfile.lock b/Gemfile.lock index d7cbc3b..6ad4ef9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/kitchen.yml b/kitchen.yml index 51b3273..eee77d8 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -26,6 +26,12 @@ platforms: - name: oraclelinux-7-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:oraclelinux-7 + - name: almalinux-8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:almalinux-8 + - name: rockylinux-8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:rockylinux-8 ## SALT `master` - name: centos-8-master-py3 @@ -43,23 +49,29 @@ platforms: - name: oraclelinux-7-master-py3 driver: image: saltimages/salt-master-py3:oraclelinux-7 + - name: almalinux-8-master-py3 + driver: + image: saltimages/salt-master-py3:almalinux-8 + - name: rockylinux-8-master-py3 + driver: + image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `3003.0` - - name: centos-8-3003-0-py3 + ## SALT `3003.1` + - name: centos-8-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:centos-8 - - name: centos-7-3003-0-py3 + image: saltimages/salt-3003.1-py3:centos-8 + - name: centos-7-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:centos-7 - - name: amazonlinux-2-3003-0-py3 + image: saltimages/salt-3003.1-py3:centos-7 + - name: amazonlinux-2-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:amazonlinux-2 - - name: oraclelinux-8-3003-0-py3 + image: saltimages/salt-3003.1-py3:amazonlinux-2 + - name: oraclelinux-8-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:oraclelinux-8 - - name: oraclelinux-7-3003-0-py3 + image: saltimages/salt-3003.1-py3:oraclelinux-8 + - name: oraclelinux-7-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:oraclelinux-7 + image: saltimages/salt-3003.1-py3:oraclelinux-7 ## SALT `3002.6` - name: centos-8-3002-6-py3 diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml index 4c1ec69..0f72bed 100644 --- a/test/integration/default/inspec.yml +++ b/test/integration/default/inspec.yml @@ -13,3 +13,5 @@ supports: - platform-name: centos - platform-name: amazon - platform-name: oracle + - platform-name: almalinux + - platform-name: rocky diff --git a/test/integration/share/inspec.yml b/test/integration/share/inspec.yml index cf623a1..ee20080 100644 --- a/test/integration/share/inspec.yml +++ b/test/integration/share/inspec.yml @@ -19,4 +19,6 @@ supports: - platform-name: oracle - platform-name: arch - platform-name: gentoo + - platform-name: almalinux + - platform-name: rocky - platform: windows diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 461dea4..87daf08 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -36,7 +36,7 @@ def build_platform_family def build_platform_name case inspec.platform[:name] - when 'amazon', 'oracle' + when 'amazon', 'oracle', 'rocky' "#{inspec.platform[:name]}linux" when /^windows_/ inspec.platform[:family]