ExternalMirrors
/
php-formula
mirror of https://github.com/saltstack-formulas/php-formula
Watch 1
Star 0
Fork 1
Code Issues 0 Releases 33 Wiki Activity
Browse Source

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

* Automated using https://github.com/myii/ssf-formula/pull/335
tags/v1.5.1
Imran Iqbal 3 years ago
parent
f55d5128ab
commit
c7a0c3c3ea
No account linked to committer's email address
8 changed files with 195 additions and 85 deletions
Split View Show Diff Stats
  1. +22
    -11
      .gitlab-ci.yml
  2. +11
    -0
      .pre-commit-config.yaml
  3. +22
    -11
      .travis.yml
  4. +1
    -1
      Gemfile.lock
  5. +134
    -61
      kitchen.yml
  6. +2
    -0
      test/integration/default/inspec.yml
  7. +2
    -0
      test/integration/share/inspec.yml
  8. +1
    -1
      test/integration/share/libraries/system.rb

+ 22
- 11
.gitlab-ci.yml View File

@@ -132,6 +132,8 @@ rubocop:
# redhat-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
# redhat-almalinux-8-tiamat-py3: {extends: '.test_instance'}
# redhat-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
debian-debian-10-master-py3: {extends: '.test_instance'}
debian-debian-9-master-py3: {extends: '.test_instance'}
ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
@@ -140,22 +142,28 @@ redhat-centos-8-master-py3: {extends: '.test_instance'}
redhat-centos-7-master-py3: {extends: '.test_instance'}
redhat-fedora-34-master-py3: {extends: '.test_instance'}
redhat-fedora-33-master-py3: {extends: '.test_instance'}
suse-opensuse-leap-153-master-py3: {extends: '.test_instance'}
suse-opensuse-leap-152-master-py3: {extends: '.test_instance'}
suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
redhat-amazonlinux-2-master-py3: {extends: '.test_instance'}
redhat-oraclelinux-8-master-py3: {extends: '.test_instance'}
redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
# debian-debian-10-3003-0-py3: {extends: '.test_instance'}
# debian-debian-9-3003-0-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
# redhat-centos-8-3003-0-py3: {extends: '.test_instance'}
# redhat-centos-7-3003-0-py3: {extends: '.test_instance'}
# redhat-fedora-34-3003-0-py3: {extends: '.test_instance'}
# redhat-fedora-33-3003-0-py3: {extends: '.test_instance'}
# redhat-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
redhat-almalinux-8-master-py3: {extends: '.test_instance'}
redhat-rockylinux-8-master-py3: {extends: '.test_instance'}
# debian-debian-10-3003-1-py3: {extends: '.test_instance'}
# debian-debian-9-3003-1-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
# redhat-centos-8-3003-1-py3: {extends: '.test_instance'}
# redhat-centos-7-3003-1-py3: {extends: '.test_instance'}
# redhat-fedora-34-3003-1-py3: {extends: '.test_instance'}
# redhat-fedora-33-3003-1-py3: {extends: '.test_instance'}
# suse-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
# redhat-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
# debian-debian-10-3002-6-py3: {extends: '.test_instance'}
# debian-debian-9-3002-6-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
@@ -167,6 +175,7 @@ redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
# redhat-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
# suse-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
# debian-debian-10-3001-7-py3: {extends: '.test_instance'}
@@ -177,6 +186,7 @@ redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
# redhat-centos-7-3001-7-py3: {extends: '.test_instance'}
# redhat-fedora-34-3001-7-py3: {extends: '.test_instance'}
# redhat-fedora-33-3001-7-py3: {extends: '.test_instance'}
# suse-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
# redhat-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
@@ -187,6 +197,7 @@ redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
# redhat-centos-8-3000-9-py3: {extends: '.test_instance'}
# redhat-centos-7-3000-9-py3: {extends: '.test_instance'}
# suse-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
# redhat-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3000-9-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]

+ 22
- 11
.travis.yml View File

@@ -92,6 +92,8 @@ jobs:
# - env: INSTANCE=redhat-amazonlinux-2-tiamat-py3
# - env: INSTANCE=redhat-oraclelinux-8-tiamat-py3
# - env: INSTANCE=redhat-oraclelinux-7-tiamat-py3
# - env: INSTANCE=redhat-almalinux-8-tiamat-py3
# - env: INSTANCE=redhat-rockylinux-8-tiamat-py3
- env: INSTANCE=debian-debian-10-master-py3
- env: INSTANCE=debian-debian-9-master-py3
- env: INSTANCE=ubuntu-ubuntu-2004-master-py3
@@ -100,22 +102,28 @@ jobs:
- env: INSTANCE=redhat-centos-7-master-py3
- env: INSTANCE=redhat-fedora-34-master-py3
- env: INSTANCE=redhat-fedora-33-master-py3
- env: INSTANCE=suse-opensuse-leap-153-master-py3
- env: INSTANCE=suse-opensuse-leap-152-master-py3
- env: INSTANCE=suse-opensuse-tmbl-latest-master-py3
- env: INSTANCE=redhat-amazonlinux-2-master-py3
- env: INSTANCE=redhat-oraclelinux-8-master-py3
- env: INSTANCE=redhat-oraclelinux-7-master-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=redhat-centos-8-3003-0-py3
# - env: INSTANCE=redhat-centos-7-3003-0-py3
# - env: INSTANCE=redhat-fedora-34-3003-0-py3
# - env: INSTANCE=redhat-fedora-33-3003-0-py3
# - env: INSTANCE=redhat-amazonlinux-2-3003-0-py3
# - env: INSTANCE=redhat-oraclelinux-8-3003-0-py3
# - env: INSTANCE=redhat-oraclelinux-7-3003-0-py3
- env: INSTANCE=redhat-almalinux-8-master-py3
- env: INSTANCE=redhat-rockylinux-8-master-py3
# - env: INSTANCE=debian-debian-10-3003-1-py3
# - env: INSTANCE=debian-debian-9-3003-1-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-3003-1-py3
# - env: INSTANCE=ubuntu-ubuntu-1804-3003-1-py3
# - env: INSTANCE=redhat-centos-8-3003-1-py3
# - env: INSTANCE=redhat-centos-7-3003-1-py3
# - env: INSTANCE=redhat-fedora-34-3003-1-py3
# - env: INSTANCE=redhat-fedora-33-3003-1-py3
# - env: INSTANCE=suse-opensuse-leap-153-3003-1-py3
# - env: INSTANCE=suse-opensuse-leap-152-3003-1-py3
# - env: INSTANCE=suse-opensuse-tmbl-latest-3003-1-py3
# - env: INSTANCE=redhat-amazonlinux-2-3003-1-py3
# - env: INSTANCE=redhat-oraclelinux-8-3003-1-py3
# - env: INSTANCE=redhat-oraclelinux-7-3003-1-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
@@ -127,6 +135,7 @@ jobs:
# - env: INSTANCE=redhat-amazonlinux-2-3002-6-py3
# - env: INSTANCE=redhat-oraclelinux-8-3002-6-py3
# - env: INSTANCE=redhat-oraclelinux-7-3002-6-py3
# - env: INSTANCE=suse-opensuse-leap-153-3002-2-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-7-py3
@@ -137,6 +146,7 @@ jobs:
# - env: INSTANCE=redhat-centos-7-3001-7-py3
# - env: INSTANCE=redhat-fedora-34-3001-7-py3
# - env: INSTANCE=redhat-fedora-33-3001-7-py3
# - env: INSTANCE=suse-opensuse-leap-153-3001-7-py3
# - env: INSTANCE=suse-opensuse-leap-152-3001-7-py3
# - env: INSTANCE=suse-opensuse-tmbl-latest-3001-7-py3
# - env: INSTANCE=redhat-amazonlinux-2-3001-7-py3
@@ -147,6 +157,7 @@ jobs:
# - env: INSTANCE=ubuntu-ubuntu-1804-3000-9-py3
# - env: INSTANCE=redhat-centos-8-3000-9-py3
# - env: INSTANCE=redhat-centos-7-3000-9-py3
# - env: INSTANCE=suse-opensuse-leap-153-3000-9-py3
# - env: INSTANCE=suse-opensuse-leap-152-3000-9-py3
# - env: INSTANCE=redhat-amazonlinux-2-3000-9-py3
# - env: INSTANCE=redhat-oraclelinux-8-3000-9-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)

+ 134
- 61
kitchen.yml View File

@@ -37,6 +37,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: debian-10-master-py3
@@ -63,6 +69,14 @@ platforms:
- name: fedora-33-master-py3
driver:
image: saltimages/salt-master-py3:fedora-33
- name: opensuse-leap-153-master-py3
driver:
image: saltimages/salt-master-py3:opensuse-leap-15.3
run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: opensuse-leap-152-master-py3
driver:
image: saltimages/salt-master-py3:opensuse-leap-15.2
@@ -99,52 +113,82 @@ platforms:
- name: gentoo-stage3-systemd-master-py3
driver:
image: saltimages/salt-master-py3:gentoo-stage3-systemd
- 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: debian-10-3003-0-py3
## SALT `3003.1`
- name: debian-10-3003-1-py3
driver:
image: saltimages/salt-3003.1-py3:debian-10
- name: debian-9-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-9
- name: ubuntu-2004-3003-1-py3
driver:
image: saltimages/salt-3003.0-py3:debian-9
- name: ubuntu-2004-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-20.04
- name: ubuntu-1804-3003-0-py3
image: saltimages/salt-3003.1-py3:ubuntu-18.04
- name: centos-8-3003-1-py3
driver:
image: saltimages/salt-3003.0-py3:ubuntu-18.04
- name: centos-8-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-8
- name: centos-7-3003-0-py3
image: saltimages/salt-3003.1-py3:centos-7
- name: fedora-34-3003-1-py3
driver:
image: saltimages/salt-3003.0-py3:centos-7
- name: fedora-34-3003-0-py3
image: saltimages/salt-3003.1-py3:fedora-34
- name: fedora-33-3003-1-py3
driver:
image: saltimages/salt-3003.0-py3:fedora-34
- name: fedora-33-3003-0-py3
image: saltimages/salt-3003.1-py3:fedora-33
- name: opensuse-leap-153-3003-1-py3
driver:
image: saltimages/salt-3003.0-py3:fedora-33
- name: amazonlinux-2-3003-0-py3
image: saltimages/salt-3003.1-py3:opensuse-leap-15.3
run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: opensuse-leap-152-3003-1-py3
driver:
image: saltimages/salt-3003.1-py3:opensuse-leap-15.2
run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: opensuse-tmbl-latest-3003-1-py3
driver:
image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest
run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- 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
- name: arch-base-latest-3003-0-py3
image: saltimages/salt-3003.1-py3:oraclelinux-7
- name: arch-base-latest-3003-1-py3
driver:
image: saltimages/salt-3003.0-py3:arch-base-latest
image: saltimages/salt-3003.1-py3:arch-base-latest
run_command: /usr/lib/systemd/systemd
- name: gentoo-stage3-latest-3003-0-py3
- name: gentoo-stage3-latest-3003-1-py3
driver:
image: saltimages/salt-3003.0-py3:gentoo-stage3-latest
image: saltimages/salt-3003.1-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3003-0-py3
- name: gentoo-stage3-systemd-3003-1-py3
driver:
image: saltimages/salt-3003.0-py3:gentoo-stage3-systemd
image: saltimages/salt-3003.1-py3:gentoo-stage3-systemd

## SALT `3002.6`
- name: debian-10-3002-6-py3
@@ -184,17 +228,23 @@ platforms:
driver:
image: saltimages/salt-3002.6-py3:arch-base-latest
run_command: /usr/lib/systemd/systemd

## SALT `3002.5`
- name: gentoo-stage3-latest-3002-5-py3
- name: gentoo-stage3-latest-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:gentoo-stage3-latest
image: saltimages/salt-3002.6-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3002-5-py3
- name: gentoo-stage3-systemd-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:gentoo-stage3-systemd
image: saltimages/salt-3002.6-py3:gentoo-stage3-systemd

## SALT `3002.2`
- name: opensuse-leap-153-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:opensuse-leap-15.3
run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: opensuse-leap-152-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
@@ -237,6 +287,14 @@ platforms:
- name: fedora-33-3001-7-py3
driver:
image: saltimages/salt-3001.7-py3:fedora-33
- name: opensuse-leap-153-3001-7-py3
driver:
image: saltimages/salt-3001.7-py3:opensuse-leap-15.3
run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: opensuse-leap-152-3001-7-py3
driver:
image: saltimages/salt-3001.7-py3:opensuse-leap-15.2
@@ -266,15 +324,13 @@ platforms:
driver:
image: saltimages/salt-3001.7-py3:arch-base-latest
run_command: /usr/lib/systemd/systemd

## SALT `3001.6`
- name: gentoo-stage3-latest-3001-6-py3
- name: gentoo-stage3-latest-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:gentoo-stage3-latest
image: saltimages/salt-3001.7-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3001-6-py3
- name: gentoo-stage3-systemd-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd
image: saltimages/salt-3001.7-py3:gentoo-stage3-systemd

## SALT `3000.9`
- name: debian-10-3000-9-py3
@@ -292,6 +348,14 @@ platforms:
- name: centos-7-3000-9-py3
driver:
image: saltimages/salt-3000.9-py3:centos-7
- name: opensuse-leap-153-3000-9-py3
driver:
image: saltimages/salt-3000.9-py3:opensuse-leap-15.3
run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: opensuse-leap-152-3000-9-py3
driver:
image: saltimages/salt-3000.9-py3:opensuse-leap-15.2
@@ -309,6 +373,13 @@ platforms:
- name: oraclelinux-7-3000-9-py3
driver:
image: saltimages/salt-3000.9-py3:oraclelinux-7
- name: gentoo-stage3-latest-3000-9-py3
driver:
image: saltimages/salt-3000.9-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3000-9-py3
driver:
image: saltimages/salt-3000.9-py3:gentoo-stage3-systemd
- name: ubuntu-1804-3000-9-py2
driver:
image: saltimages/salt-3000.9-py2:ubuntu-18.04
@@ -317,15 +388,6 @@ platforms:
image: saltimages/salt-3000.9-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd

## SALT `3000.8`
- name: gentoo-stage3-latest-3000-8-py3
driver:
image: saltimages/salt-3000.8-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3000-8-py3
driver:
image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd

provisioner:
name: salt_solo
log_level: debug
@@ -351,8 +413,8 @@ suites:
- debian-9-tiamat-py3
- debian-10-master-py3
- debian-9-master-py3
- debian-10-3003-0-py3
- debian-9-3003-0-py3
- debian-10-3003-1-py3
- debian-9-3003-1-py3
- debian-10-3002-6-py3
- debian-9-3002-6-py3
- debian-10-3001-7-py3
@@ -386,8 +448,8 @@ suites:
- ubuntu-1804-tiamat-py3
- ubuntu-2004-master-py3
- ubuntu-1804-master-py3
- ubuntu-2004-3003-0-py3
- ubuntu-1804-3003-0-py3
- ubuntu-2004-3003-1-py3
- ubuntu-1804-3003-1-py3
- ubuntu-2004-3002-6-py3
- ubuntu-1804-3002-6-py3
- ubuntu-2004-3001-7-py3
@@ -424,6 +486,8 @@ suites:
- amazonlinux-2-tiamat-py3
- oraclelinux-8-tiamat-py3
- oraclelinux-7-tiamat-py3
- almalinux-8-tiamat-py3
- rockylinux-8-tiamat-py3
- centos-8-master-py3
- centos-7-master-py3
- fedora-34-master-py3
@@ -431,13 +495,15 @@ suites:
- amazonlinux-2-master-py3
- oraclelinux-8-master-py3
- oraclelinux-7-master-py3
- centos-8-3003-0-py3
- centos-7-3003-0-py3
- fedora-34-3003-0-py3
- fedora-33-3003-0-py3
- amazonlinux-2-3003-0-py3
- oraclelinux-8-3003-0-py3
- oraclelinux-7-3003-0-py3
- almalinux-8-master-py3
- rockylinux-8-master-py3
- centos-8-3003-1-py3
- centos-7-3003-1-py3
- fedora-34-3003-1-py3
- fedora-33-3003-1-py3
- amazonlinux-2-3003-1-py3
- oraclelinux-8-3003-1-py3
- oraclelinux-7-3003-1-py3
- centos-8-3002-6-py3
- centos-7-3002-6-py3
- fedora-34-3002-6-py3
@@ -475,12 +541,19 @@ suites:
- path: test/integration/default
- name: suse
includes:
- opensuse-leap-153-master-py3
- opensuse-leap-152-master-py3
- opensuse-tmbl-latest-master-py3
- opensuse-leap-153-3003-1-py3
- opensuse-leap-152-3003-1-py3
- opensuse-tmbl-latest-3003-1-py3
- opensuse-leap-153-3002-2-py3
- opensuse-leap-152-3002-2-py3
- opensuse-tmbl-latest-3002-2-py3
- opensuse-leap-153-3001-7-py3
- opensuse-leap-152-3001-7-py3
- opensuse-tmbl-latest-3001-7-py3
- opensuse-leap-153-3000-9-py3
- opensuse-leap-152-3000-9-py3
provisioner:
state_top:

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

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

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

Write Preview
Loading…
Cancel
Save