ci(kitchen+travis): adjust matrix to add 3001
* Semi-automated using https://github.com/myii/ssf-formula/pull/230
This commit is contained in:
parent
7115904da9
commit
9060879924
21
.travis.yml
21
.travis.yml
@ -58,15 +58,28 @@ jobs:
|
||||
## Define the rest of the matrix based on Kitchen testing
|
||||
# Make sure the instances listed below match up with
|
||||
# the `platforms` defined in `kitchen.yml`
|
||||
- env: INSTANCE=v3000-py3-debian-10-3000-3-py3
|
||||
- env: INSTANCE=v3001-py3-debian-10-3001-py3
|
||||
# - env: INSTANCE=v3001-py3-debian-9-3001-py3
|
||||
- env: INSTANCE=v3001-py3-ubuntu-2004-3001-py3
|
||||
# - env: INSTANCE=v3001-py3-ubuntu-1804-3001-py3
|
||||
- env: INSTANCE=v3001-py3-centos-8-3001-py3
|
||||
# - env: INSTANCE=v3001-py3-centos-7-3001-py3
|
||||
- env: INSTANCE=v3001-py3-fedora-32-3001-py3
|
||||
# - env: INSTANCE=v3001-py3-fedora-31-3001-py3
|
||||
# - env: INSTANCE=v3001-py3-opensuse-leap-152-3001-py3
|
||||
# - env: INSTANCE=v3001-py3-amazonlinux-2-3001-py3
|
||||
- env: INSTANCE=v3001-py3-oraclelinux-8-3001-py3
|
||||
# - env: INSTANCE=v3001-py3-oraclelinux-7-3001-py3
|
||||
# - env: INSTANCE=v3000-py3-debian-10-3000-3-py3
|
||||
# - env: INSTANCE=v3000-py3-debian-9-3000-3-py3
|
||||
# - env: INSTANCE=v3000-py3-ubuntu-1804-3000-3-py3
|
||||
- env: INSTANCE=v3000-py3-centos-8-3000-3-py3
|
||||
# - env: INSTANCE=v3000-py3-centos-8-3000-3-py3
|
||||
# - env: INSTANCE=v3000-py3-centos-7-3000-3-py3
|
||||
- env: INSTANCE=v3000-py3-fedora-31-3000-3-py3
|
||||
- env: INSTANCE=v3000-py3-opensuse-leap-152-3000-3-py3
|
||||
- env: INSTANCE=v3000-py3-opensuse-leap-151-3000-3-py3
|
||||
- env: INSTANCE=v3000-py3-amazonlinux-2-3000-3-py3
|
||||
# - env: INSTANCE=v3000-py3-oraclelinux-8-3000-3-py3
|
||||
- env: INSTANCE=v3000-py3-oraclelinux-7-3000-3-py3
|
||||
- env: INSTANCE=v3000-py2-ubuntu-1804-3000-3-py2
|
||||
# - env: INSTANCE=v3000-py2-ubuntu-1604-3000-3-py2
|
||||
# - env: INSTANCE=v201902-py3-debian-10-2019-2-py3
|
||||
@ -75,6 +88,8 @@ jobs:
|
||||
- env: INSTANCE=v201902-py3-ubuntu-1604-2019-2-py3
|
||||
# - env: INSTANCE=v201902-py3-centos-8-2019-2-py3
|
||||
- env: INSTANCE=v201902-py3-centos-7-2019-2-py3
|
||||
# - env: INSTANCE=v201902-py3-fedora-31-2019-2-py3
|
||||
# - env: INSTANCE=v201902-py3-opensuse-leap-152-2019-2-py3
|
||||
# - env: INSTANCE=v201902-py3-amazonlinux-2-2019-2-py3
|
||||
- env: INSTANCE=v201902-py2-centos-6-2019-2-py2
|
||||
# - env: INSTANCE=v201902-py2-amazonlinux-1-2019-2-py2
|
||||
|
106
kitchen.yml
106
kitchen.yml
@ -11,6 +11,49 @@ driver:
|
||||
# Make sure the platforms listed below match up with
|
||||
# the `env.matrix` instances defined in `.travis.yml`
|
||||
platforms:
|
||||
## SALT `3001`
|
||||
- name: debian-10-3001-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001-py3:debian-10
|
||||
- name: debian-9-3001-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001-py3:debian-9
|
||||
- name: ubuntu-2004-3001-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001-py3:ubuntu-20.04
|
||||
- name: ubuntu-1804-3001-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001-py3:ubuntu-18.04
|
||||
- name: centos-8-3001-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001-py3:centos-8
|
||||
- name: centos-7-3001-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001-py3:centos-7
|
||||
- name: fedora-32-3001-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001-py3:fedora-32
|
||||
- name: fedora-31-3001-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001-py3:fedora-31
|
||||
- name: opensuse-leap-152-3001-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001-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: amazonlinux-2-3001-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001-py3:amazonlinux-2
|
||||
- name: oraclelinux-8-3001-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001-py3:oraclelinux-8
|
||||
- name: oraclelinux-7-3001-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001-py3:oraclelinux-7
|
||||
|
||||
## SALT `3000.3`
|
||||
- name: debian-10-3000-3-py3
|
||||
driver:
|
||||
@ -38,17 +81,15 @@ platforms:
|
||||
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
||||
transport:
|
||||
max_ssh_sessions: 1
|
||||
- name: opensuse-leap-151-3000-3-py3
|
||||
driver:
|
||||
image: netmanagers/salt-3000.3-py3:opensuse-leap-15.1
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
|
||||
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
||||
transport:
|
||||
max_ssh_sessions: 1
|
||||
- name: amazonlinux-2-3000-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3000.3-py3:amazonlinux-2
|
||||
- name: oraclelinux-8-3000-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3000.3-py3:oraclelinux-8
|
||||
- name: oraclelinux-7-3000-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3000.3-py3:oraclelinux-7
|
||||
- name: ubuntu-1804-3000-3-py2
|
||||
driver:
|
||||
image: saltimages/salt-3000.3-py2:ubuntu-18.04
|
||||
@ -75,6 +116,17 @@ platforms:
|
||||
- name: centos-7-2019-2-py3
|
||||
driver:
|
||||
image: saltimages/salt-2019.2-py3:centos-7
|
||||
- name: fedora-31-2019-2-py3
|
||||
driver:
|
||||
image: saltimages/salt-2019.2-py3:fedora-31
|
||||
- name: opensuse-leap-152-2019-2-py3
|
||||
driver:
|
||||
image: saltimages/salt-2019.2-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: amazonlinux-2-2019-2-py3
|
||||
driver:
|
||||
image: saltimages/salt-2019.2-py3:amazonlinux-2
|
||||
@ -106,6 +158,39 @@ verifier:
|
||||
- cli
|
||||
|
||||
suites:
|
||||
- name: v3001-py3
|
||||
includes:
|
||||
- debian-10-3001-py3
|
||||
- debian-9-3001-py3
|
||||
- ubuntu-2004-3001-py3
|
||||
- ubuntu-1804-3001-py3
|
||||
- centos-8-3001-py3
|
||||
- centos-7-3001-py3
|
||||
- fedora-32-3001-py3
|
||||
- fedora-31-3001-py3
|
||||
- opensuse-leap-152-3001-py3
|
||||
- amazonlinux-2-3001-py3
|
||||
- oraclelinux-8-3001-py3
|
||||
- oraclelinux-7-3001-py3
|
||||
provisioner:
|
||||
state_top:
|
||||
base:
|
||||
'*':
|
||||
- salt.pkgrepo
|
||||
- salt.master
|
||||
- salt.minion
|
||||
pillars:
|
||||
top.sls:
|
||||
base:
|
||||
'*':
|
||||
- salt
|
||||
- v3001-py3
|
||||
pillars_from_files:
|
||||
salt.sls: test/salt/pillar/salt.sls
|
||||
v3001-py3.sls: test/salt/pillar/v3001-py3.sls
|
||||
verifier:
|
||||
inspec_tests:
|
||||
- path: test/integration/v3001-py3
|
||||
- name: v3000-py3
|
||||
includes:
|
||||
- debian-10-3000-3-py3
|
||||
@ -115,8 +200,9 @@ suites:
|
||||
- centos-7-3000-3-py3
|
||||
- fedora-31-3000-3-py3
|
||||
- opensuse-leap-152-3000-3-py3
|
||||
- opensuse-leap-151-3000-3-py3
|
||||
- amazonlinux-2-3000-3-py3
|
||||
- oraclelinux-8-3000-3-py3
|
||||
- oraclelinux-7-3000-3-py3
|
||||
provisioner:
|
||||
state_top:
|
||||
base:
|
||||
@ -167,6 +253,8 @@ suites:
|
||||
- ubuntu-1604-2019-2-py3
|
||||
- centos-8-2019-2-py3
|
||||
- centos-7-2019-2-py3
|
||||
- fedora-31-2019-2-py3
|
||||
- opensuse-leap-152-2019-2-py3
|
||||
- amazonlinux-2-2019-2-py3
|
||||
provisioner:
|
||||
state_top:
|
||||
|
@ -15,4 +15,5 @@ supports:
|
||||
- platform-name: suse
|
||||
- platform-name: freebsd
|
||||
- platform-name: amazon
|
||||
- platform-name: oracle
|
||||
- platform-name: arch
|
||||
|
@ -15,4 +15,5 @@ supports:
|
||||
- platform-name: suse
|
||||
- platform-name: freebsd
|
||||
- platform-name: amazon
|
||||
- platform-name: oracle
|
||||
- platform-name: arch
|
||||
|
@ -15,4 +15,5 @@ supports:
|
||||
- platform-name: suse
|
||||
- platform-name: freebsd
|
||||
- platform-name: amazon
|
||||
- platform-name: oracle
|
||||
- platform-name: arch
|
||||
|
@ -15,4 +15,5 @@ supports:
|
||||
- platform-name: suse
|
||||
- platform-name: freebsd
|
||||
- platform-name: amazon
|
||||
- platform-name: oracle
|
||||
- platform-name: arch
|
||||
|
50
test/integration/v3001-py3/README.md
Normal file
50
test/integration/v3001-py3/README.md
Normal file
@ -0,0 +1,50 @@
|
||||
# InSpec Profile: `v3001-py3`
|
||||
|
||||
This shows the implementation of the `v3001-py3` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
|
||||
|
||||
## Verify a profile
|
||||
|
||||
InSpec ships with built-in features to verify a profile structure.
|
||||
|
||||
```bash
|
||||
$ inspec check v3001-py3
|
||||
Summary
|
||||
-------
|
||||
Location: v3001-py3
|
||||
Profile: profile
|
||||
Controls: 4
|
||||
Timestamp: 2019-06-24T23:09:01+00:00
|
||||
Valid: true
|
||||
|
||||
Errors
|
||||
------
|
||||
|
||||
Warnings
|
||||
--------
|
||||
```
|
||||
|
||||
## Execute a profile
|
||||
|
||||
To run all **supported** controls on a local machine use `inspec exec /path/to/profile`.
|
||||
|
||||
```bash
|
||||
$ inspec exec v3001-py3
|
||||
..
|
||||
|
||||
Finished in 0.0025 seconds (files took 0.12449 seconds to load)
|
||||
8 examples, 0 failures
|
||||
```
|
||||
|
||||
## Execute a specific control from a profile
|
||||
|
||||
To run one control from the profile use `inspec exec /path/to/profile --controls name`.
|
||||
|
||||
```bash
|
||||
$ inspec exec v3001-py3 --controls package
|
||||
.
|
||||
|
||||
Finished in 0.0025 seconds (files took 0.12449 seconds to load)
|
||||
1 examples, 0 failures
|
||||
```
|
||||
|
||||
See an [example control here](https://github.com/inspec/inspec/blob/master/examples/profile/controls/example.rb).
|
19
test/integration/v3001-py3/inspec.yml
Normal file
19
test/integration/v3001-py3/inspec.yml
Normal file
@ -0,0 +1,19 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
name: v3001-py3
|
||||
title: salt formula
|
||||
maintainer: SaltStack Formulas
|
||||
license: Apache-2.0
|
||||
summary: Verify that Salt `v3001-py3` is setup and configured
|
||||
supports:
|
||||
- platform-name: debian
|
||||
- platform-name: ubuntu
|
||||
- platform-name: centos
|
||||
- platform-name: fedora
|
||||
- platform-name: opensuse
|
||||
- platform-name: suse
|
||||
- platform-name: freebsd
|
||||
- platform-name: amazon
|
||||
- platform-name: oracle
|
||||
- platform-name: arch
|
Loading…
Reference in New Issue
Block a user