Browse Source

ci(3003.1): update inc. AlmaLinux, Rocky & `rst-lint` [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/335
tags/v0.10.4
Imran Iqbal 3 years ago
parent
commit
97b0af695a
No account linked to committer's email address
7 changed files with 32 additions and 19 deletions
  1. +4
    -4
      .gitlab-ci.yml
  2. +11
    -0
      .pre-commit-config.yaml
  3. +4
    -4
      .travis.yml
  4. +1
    -1
      Gemfile.lock
  5. +9
    -9
      kitchen.yml
  6. +2
    -0
      test/integration/share/inspec.yml
  7. +1
    -1
      test/integration/share/libraries/system.rb

+ 4
- 4
.gitlab-ci.yml View File

@@ -143,10 +143,10 @@ ubuntu-2004-master-py3: {extends: '.test_instance'}
# preferences-ubuntu-1804-master-py3: {extends: '.test_instance'}
# unattended-ubuntu-1804-master-py3: {extends: '.test_instance'}
ubuntu-1804-master-py3: {extends: '.test_instance'}
# repositories-debian-10-3003-0-py3: {extends: '.test_instance'}
# repositories-debian-9-3003-0-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
# repositories-debian-10-3003-1-py3: {extends: '.test_instance'}
# repositories-debian-9-3003-1-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
# repositories-debian-10-3002-6-py3: {extends: '.test_instance'}
# repositories-debian-9-3002-6-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}

+ 11
- 0
.pre-commit-config.yaml View File

@@ -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]

+ 4
- 4
.travis.yml View File

@@ -103,10 +103,10 @@ jobs:
# - env: INSTANCE=preferences-ubuntu-1804-master-py3
# - env: INSTANCE=unattended-ubuntu-1804-master-py3
- env: INSTANCE=ubuntu-1804-master-py3
# - env: INSTANCE=repositories-debian-10-3003-0-py3
# - env: INSTANCE=repositories-debian-9-3003-0-py3
# - env: INSTANCE=repositories-ubuntu-2004-3003-0-py3
# - env: INSTANCE=repositories-ubuntu-1804-3003-0-py3
# - env: INSTANCE=repositories-debian-10-3003-1-py3
# - env: INSTANCE=repositories-debian-9-3003-1-py3
# - env: INSTANCE=repositories-ubuntu-2004-3003-1-py3
# - env: INSTANCE=repositories-ubuntu-1804-3003-1-py3
# - env: INSTANCE=repositories-debian-10-3002-6-py3
# - env: INSTANCE=repositories-debian-9-3002-6-py3
# - env: INSTANCE=repositories-ubuntu-2004-3002-6-py3

+ 1
- 1
Gemfile.lock View File

@@ -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)

+ 9
- 9
kitchen.yml View File

@@ -37,19 +37,19 @@ platforms:
driver:
image: saltimages/salt-master-py3:ubuntu-18.04

## SALT `3003.0`
- name: debian-10-3003-0-py3
## SALT `3003.1`
- name: debian-10-3003-1-py3
driver:
image: saltimages/salt-3003.0-py3:debian-10
- name: debian-9-3003-0-py3
image: saltimages/salt-3003.1-py3:debian-10
- name: debian-9-3003-1-py3
driver:
image: saltimages/salt-3003.0-py3:debian-9
- name: ubuntu-2004-3003-0-py3
image: saltimages/salt-3003.1-py3:debian-9
- name: ubuntu-2004-3003-1-py3
driver:
image: saltimages/salt-3003.0-py3:ubuntu-20.04
- name: ubuntu-1804-3003-0-py3
image: saltimages/salt-3003.1-py3:ubuntu-20.04
- name: ubuntu-1804-3003-1-py3
driver:
image: saltimages/salt-3003.0-py3:ubuntu-18.04
image: saltimages/salt-3003.1-py3:ubuntu-18.04

## SALT `3002.6`
- name: debian-10-3002-6-py3

+ 2
- 0
test/integration/share/inspec.yml View File

@@ -19,4 +19,6 @@ supports:
- platform-name: oracle
- platform-name: arch
- platform-name: gentoo
- platform-name: almalinux
- platform-name: rocky
- platform: windows

+ 1
- 1
test/integration/share/libraries/system.rb View File

@@ -36,7 +36,7 @@ class SystemResource < Inspec.resource(1)

def build_platform_name
case inspec.platform[:name]
when 'amazon', 'oracle'
when 'amazon', 'oracle', 'rocky'
"#{inspec.platform[:name]}linux"
when /^windows_/
inspec.platform[:family]

Loading…
Cancel
Save