Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(3003.1): update inc. AlmaLinux, Rocky & rst-lint #335

Merged
merged 9 commits into from
Jul 2, 2021
Merged

feat(3003.1): update inc. AlmaLinux, Rocky & rst-lint #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f76e21a
feat(saltimages): update with latest changes from `salt-image-builder`
myii Jun 24, 2021
f00ec52
feat(saltimages): update with latest changes from `salt-image-builder`
myii Jun 24, 2021
25ce78a
feat(pre-commit): add `rst-lint`
myii May 17, 2021
2ef7b8c
fix(rst-lint): fix violations
myii Jul 1, 2021
338ed9a
feat(gemfile.lock): update `kitchen-docker` revision
myii Jun 27, 2021
2bd30f3
feat(suricata): disable failing instances
myii Jun 29, 2021
f638761
feat(nginx): disable failing instance until upstream issue resolved
myii Jul 1, 2021
d8310d3
feat(saltimages): update with latest changes from `salt-image-builder`
myii Jul 1, 2021
26c7f76
chore(defaults): update commit title and body
myii Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,15 @@ 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|
ssf/files/default/docs/TOFS_pattern.rst|
)$
additional_dependencies: [pygments==2.9.0]
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion docs/CONTRIBUTING.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ To preserve good formatting of these notes, the following format is prescribed:

An example of that:

.. code-block:: git
.. code-block:: console

...

Expand Down
109 changes: 75 additions & 34 deletions ssf/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ ssf_node_anchors:
# An alternative method could be to use:
# `git describe --abbrev=0 --tags`
# yamllint disable rule:line-length rule:quoted-strings
title: "ci: enable Vagrant-based testing using GitHub Actions"
body: '* Automated using https://github.com/myii/ssf-formula/pull/334'
title: "ci(3003.1): update inc. AlmaLinux, Rocky & '`'rst-lint'`' [skip ci]"
body: '* Automated using https://github.com/myii/ssf-formula/pull/335'
# yamllint enable rule:line-length rule:quoted-strings
github:
owner: 'saltstack-formulas'
Expand Down Expand Up @@ -117,6 +117,8 @@ ssf_node_anchors:
- oracle
- arch
- gentoo
- almalinux
- rocky
- windows
provisioner:
dependencies: []
Expand Down Expand Up @@ -163,6 +165,8 @@ ssf_node_anchors:
# - [oraclelinux , 0 , master, 0, default]
# - [arch-base , 0 , master, 0, default]
# - [gentoo/stage3, 0 , master, 0, default]
# - [almalinux , 0 , master, 0, default]
# - [rockylinux , 0 , master, 0, default]
# To deal with excessive instances when mimicking `kitchen list -b`
# If values are set, only use these as commented entries in the matrix
platforms_matrix_commented_includes: []
Expand Down Expand Up @@ -332,6 +336,7 @@ ssf:
### Already available but not using across the Formulas' org until released
# - [fedora , 35 , tiamat, 3] # fedo-35.0-tiamat-py3
- [fedora , 35 , master, 3] # fedo-35.0-master-py3
- [fedora , 35 , 3003.1, 3] # fedo-35.0-3003.1-py3
- [fedora , 35 , 3003.0, 3] # fedo-35.0-3003.0-py3
- [fedora , 35 , 3002.6, 3] # fedo-35.0-3002.6-py3
- [fedora , 35 , 3001.7, 3] # fedo-35.0-3001.7-py3
Expand All @@ -346,11 +351,14 @@ ssf:
# # Not available at the current time
# - [fedora , 34 , tiamat, 3] # fedo-34.0-tiamat-py3
# - [fedora , 33 , tiamat, 3] # fedo-33.0-tiamat-py3
# - [opensuse/leap, 15.3 , tiamat, 3] # opsu-15.3-tiamat-py3
# - [opensuse/leap, 15.2 , tiamat, 3] # opsu-15.2-tiamat-py3
# - [opensuse/tmbl, latest, tiamat, 3] # opsu-tmbl-tiamat-py3
- [amazonlinux , 2 , tiamat, 3] # amaz-02.0-tiamat-py3
- [oraclelinux , 8 , tiamat, 3] # orac-08.0-tiamat-py3
- [oraclelinux , 7 , tiamat, 3] # orac-07.0-tiamat-py3
- [almalinux , 8 , tiamat, 3] # alma-08.0-tiamat-py3
- [rockylinux , 8 , tiamat, 3] # rock-08.0-tiamat-py3

### `master-py3`
- [debian , 10 , master, 3] # debi-10.0-master-py3
Expand All @@ -361,6 +369,7 @@ ssf:
- [centos , 7 , master, 3] # cent-07.0-master-py3
- [fedora , 34 , master, 3] # fedo-34.0-master-py3
- [fedora , 33 , master, 3] # fedo-33.0-master-py3
- [opensuse/leap, 15.3 , master, 3] # opsu-15.3-master-py3
- [opensuse/leap, 15.2 , master, 3] # opsu-15.2-master-py3
- [opensuse/tmbl, latest, master, 3] # opsu-tmbl-master-py3
- [amazonlinux , 2 , master, 3] # amaz-02.0-master-py3
Expand All @@ -369,24 +378,27 @@ ssf:
- [arch-base , latest, master, 3] # arch-late-master-py3
- [gentoo/stage3, latest, master, 3] # gent-late-master-py3
- [gentoo/stage3, systemd, master, 3] # gent-sysd-master-py3
- [almalinux , 8 , master, 3] # alma-08.0-master-py3
- [rockylinux , 8 , master, 3] # rock-08.0-master-py3

### `3003.0-py3`
- [debian , 10 , 3003.0, 3] # debi-10.0-3003.0-py3
- [debian , 9 , 3003.0, 3] # debi-09.0-3003.0-py3
- [ubuntu , 20.04, 3003.0, 3] # ubun-20.0-3003.0-py3
- [ubuntu , 18.04, 3003.0, 3] # ubun-18.0-3003.0-py3
- [centos , 8 , 3003.0, 3] # cent-08.0-3003.0-py3
- [centos , 7 , 3003.0, 3] # cent-07.0-3003.0-py3
- [fedora , 34 , 3003.0, 3] # fedo-34.0-3003.0-py3
- [fedora , 33 , 3003.0, 3] # fedo-33.0-3003.0-py3
# - [opensuse/leap, 15.2 , 3003.0, 3] # opsu-15.2-3003.0-py3
# - [opensuse/tmbl, latest, 3003.0, 3] # opsu-tmbl-3003.0-py3
- [amazonlinux , 2 , 3003.0, 3] # amaz-02.0-3003.0-py3
- [oraclelinux , 8 , 3003.0, 3] # orac-08.0-3003.0-py3
- [oraclelinux , 7 , 3003.0, 3] # orac-07.0-3003.0-py3
- [arch-base , latest, 3003.0, 3] # arch-late-3003.0-py3
- [gentoo/stage3, latest, 3003.0, 3] # gent-late-3003.0-py3
- [gentoo/stage3, systemd, 3003.0, 3] # gent-sysd-3003.0-py3
### `3003.1-py3`
- [debian , 10 , 3003.1, 3] # debi-10.0-3003.1-py3
- [debian , 9 , 3003.1, 3] # debi-09.0-3003.1-py3
- [ubuntu , 20.04, 3003.1, 3] # ubun-20.0-3003.1-py3
- [ubuntu , 18.04, 3003.1, 3] # ubun-18.0-3003.1-py3
- [centos , 8 , 3003.1, 3] # cent-08.0-3003.1-py3
- [centos , 7 , 3003.1, 3] # cent-07.0-3003.1-py3
- [fedora , 34 , 3003.1, 3] # fedo-34.0-3003.1-py3
- [fedora , 33 , 3003.1, 3] # fedo-33.0-3003.1-py3
- [opensuse/leap, 15.3 , 3003.1, 3] # opsu-15.3-3003.1-py3
- [opensuse/leap, 15.2 , 3003.1, 3] # opsu-15.2-3003.1-py3
- [opensuse/tmbl, latest, 3003.1, 3] # opsu-tmbl-3003.1-py3
- [amazonlinux , 2 , 3003.1, 3] # amaz-02.0-3003.1-py3
- [oraclelinux , 8 , 3003.1, 3] # orac-08.0-3003.1-py3
- [oraclelinux , 7 , 3003.1, 3] # orac-07.0-3003.1-py3
- [arch-base , latest, 3003.1, 3] # arch-late-3003.1-py3
- [gentoo/stage3, latest, 3003.1, 3] # gent-late-3003.1-py3
- [gentoo/stage3, systemd, 3003.1, 3] # gent-sysd-3003.1-py3

### `3002.6-py3`
- [debian , 10 , 3002.6, 3] # debi-10.0-3002.6-py3
Expand All @@ -397,18 +409,17 @@ ssf:
- [centos , 7 , 3002.6, 3] # cent-07.0-3002.6-py3
- [fedora , 34 , 3002.6, 3] # fedo-34.0-3002.6-py3
- [fedora , 33 , 3002.6, 3] # fedo-33.0-3002.6-py3
# - [opensuse/leap, 15.3 , 3002.6, 3] # opsu-15.3-3002.6-py3
# - [opensuse/leap, 15.2 , 3002.6, 3] # opsu-15.2-3002.6-py3
# - [opensuse/tmbl, latest, 3002.6, 3] # opsu-tmbl-3002.6-py3
- [amazonlinux , 2 , 3002.6, 3] # amaz-02.0-3002.6-py3
- [oraclelinux , 8 , 3002.6, 3] # orac-08.0-3002.6-py3
- [oraclelinux , 7 , 3002.6, 3] # orac-07.0-3002.6-py3
- [arch-base , latest, 3002.6, 3] # arch-late-3002.6-py3
# - [gentoo/stage3, latest, 3002.6, 3] # gent-late-3002.6-py3
# - [gentoo/stage3, systemd, 3002.6, 3] # gent-sysd-3002.6-py3
### `3002.5-py3`
- [gentoo/stage3, latest, 3002.5, 3] # gent-late-3002.5-py3
- [gentoo/stage3, systemd, 3002.5, 3] # gent-sysd-3002.5-py3
- [gentoo/stage3, latest, 3002.6, 3] # gent-late-3002.6-py3
- [gentoo/stage3, systemd, 3002.6, 3] # gent-sysd-3002.6-py3
### `3002.2-py3`
- [opensuse/leap, 15.3 , 3002.2, 3] # opsu-15.3-3002.2-py3
- [opensuse/leap, 15.2 , 3002.2, 3] # opsu-15.2-3002.2-py3
- [opensuse/tmbl, latest, 3002.2, 3] # opsu-tmbl-3002.2-py3

Expand All @@ -421,36 +432,49 @@ ssf:
- [centos , 7 , 3001.7, 3] # cent-07.0-3001.7-py3
- [fedora , 34 , 3001.7, 3] # fedo-34.0-3001.7-py3
- [fedora , 33 , 3001.7, 3] # fedo-33.0-3001.7-py3
- [opensuse/leap, 15.3 , 3001.7, 3] # opsu-15.3-3001.7-py3
- [opensuse/leap, 15.2 , 3001.7, 3] # opsu-15.2-3001.7-py3
- [opensuse/tmbl, latest, 3001.7, 3] # opsu-tmbl-3001.7-py3
- [amazonlinux , 2 , 3001.7, 3] # amaz-02.0-3001.7-py3
- [oraclelinux , 8 , 3001.7, 3] # orac-08.0-3001.7-py3
- [oraclelinux , 7 , 3001.7, 3] # orac-07.0-3001.7-py3
- [arch-base , latest, 3001.7, 3] # arch-late-3001.7-py3
# - [gentoo/stage3, latest, 3001.7, 3] # gent-late-3001.7-py3
# - [gentoo/stage3, systemd, 3001.7, 3] # gent-sysd-3001.7-py3
### `3001.6-py3`
- [gentoo/stage3, latest, 3001.6, 3] # gent-late-3001.6-py3
- [gentoo/stage3, systemd, 3001.6, 3] # gent-sysd-3001.6-py3
- [gentoo/stage3, latest, 3001.7, 3] # gent-late-3001.7-py3
- [gentoo/stage3, systemd, 3001.7, 3] # gent-sysd-3001.7-py3

### `3000.9-py3`
- [debian , 10 , 3000.9, 3] # debi-10.0-3000.9-py3
- [debian , 9 , 3000.9, 3] # debi-09.0-3000.9-py3
- [ubuntu , 18.04, 3000.9, 3] # ubun-18.0-3000.9-py3
- [centos , 8 , 3000.9, 3] # cent-08.0-3000.9-py3
- [centos , 7 , 3000.9, 3] # cent-07.0-3000.9-py3
- [opensuse/leap, 15.3 , 3000.9, 3] # opsu-15.3-3000.9-py3
- [opensuse/leap, 15.2 , 3000.9, 3] # opsu-15.2-3000.9-py3
- [amazonlinux , 2 , 3000.9, 3] # amaz-02.0-3000.9-py3
- [oraclelinux , 8 , 3000.9, 3] # orac-08.0-3000.9-py3
- [oraclelinux , 7 , 3000.9, 3] # orac-07.0-3000.9-py3
# - [gentoo/stage3, latest, 3000.9, 3] # gent-late-3000.9-py3
# - [gentoo/stage3, systemd, 3000.9, 3] # gent-sysd-3000.9-py3
- [gentoo/stage3, latest, 3000.9, 3] # gent-late-3000.9-py3
- [gentoo/stage3, systemd, 3000.9, 3] # gent-sysd-3000.9-py3
### `3000.9-py2`
- [ubuntu , 18.04, 3000.9, 2] # ubun-18.0-3000.9-py2
- [arch-base , latest, 3000.9, 2] # arch-late-3000.9-py2
### `3000.8-py3`
- [gentoo/stage3, latest, 3000.8, 3] # gent-late-3000.8-py3
- [gentoo/stage3, systemd, 3000.8, 3] # gent-sysd-3000.8-py3

saltimages_deprecated_stable_by_git:
### These aren't deprecated per se, since they are the latest `stable` images
### available; however, a latest version `git`-based image is available so using
### that instead to avoid numerous inconsistencies across the org
### Both issues from this formula and in the rendered files such as `kitchen.yml`
### `3003.0-py3`
- [fedora , 34 , 3003.0, 3] # fedo-34.0-3003.0-py3
- [fedora , 33 , 3003.0, 3] # fedo-33.0-3003.0-py3

### `3002.5-py3`
- [gentoo/stage3, latest, 3002.5, 3] # gent-late-3002.5-py3
- [gentoo/stage3, systemd, 3002.5, 3] # gent-sysd-3002.5-py3

### `3001.6-py3`
- [gentoo/stage3, latest, 3001.6, 3] # gent-late-3001.6-py3
- [gentoo/stage3, systemd, 3001.6, 3] # gent-sysd-3001.6-py3

saltimages_deprecated:
### Deprecated, no longer being built but still available in Docker Hub
Expand All @@ -463,7 +487,22 @@ ssf:
- [fedora , 31 , master, 3] # fedo-31.0-master-py3

### `3003.0-py3`
- [debian , 10 , 3003.0, 3] # debi-10.0-3003.0-py3
- [debian , 9 , 3003.0, 3] # debi-09.0-3003.0-py3
- [ubuntu , 20.04, 3003.0, 3] # ubun-20.0-3003.0-py3
- [ubuntu , 18.04, 3003.0, 3] # ubun-18.0-3003.0-py3
- [centos , 8 , 3003.0, 3] # cent-08.0-3003.0-py3
- [centos , 7 , 3003.0, 3] # cent-07.0-3003.0-py3
- [fedora , 32 , 3003.0, 3] # fedo-32.0-3003.0-py3
# - [opensuse/leap, 15.3 , 3003.0, 3] # opsu-15.3-3003.0-py3
# - [opensuse/leap, 15.2 , 3003.0, 3] # opsu-15.2-3003.0-py3
# - [opensuse/tmbl, latest, 3003.0, 3] # opsu-tmbl-3003.0-py3
- [amazonlinux , 2 , 3003.0, 3] # amaz-02.0-3003.0-py3
- [oraclelinux , 8 , 3003.0, 3] # orac-08.0-3003.0-py3
- [oraclelinux , 7 , 3003.0, 3] # orac-07.0-3003.0-py3
- [arch-base , latest, 3003.0, 3] # arch-late-3003.0-py3
- [gentoo/stage3, latest, 3003.0, 3] # gent-late-3003.0-py3
- [gentoo/stage3, systemd, 3003.0, 3] # gent-sysd-3003.0-py3

### `3002.6-py3`
- [ubuntu , 16.04, 3002.6, 3] # ubun-16.0-3002.6-py3
Expand Down Expand Up @@ -651,6 +690,8 @@ ssf:
- [amazonlinux , 2 , 3000.8, 3] # amaz-02.0-3000.8-py3
- [oraclelinux , 8 , 3000.8, 3] # orac-08.0-3000.8-py3
- [oraclelinux , 7 , 3000.8, 3] # orac-07.0-3000.8-py3
- [gentoo/stage3, latest, 3000.8, 3] # gent-late-3000.8-py3
- [gentoo/stage3, systemd, 3000.8, 3] # gent-sysd-3000.8-py3
### `3000.8-py2`
- [ubuntu , 18.04, 3000.8, 2] # ubun-18.0-3000.8-py2
- [ubuntu , 16.04, 3000.8, 2] # ubun-16.0-3000.8-py2
Expand Down
20 changes: 20 additions & 0 deletions ssf/files/default/.pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,23 @@ 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|
{#- Required until the Antora solution is finalised, which then allows
the `readthedocs` site to be disbanded #}
{%- if semrel_formula == 'template' %}
docs/CONTRIBUTING_DOCS.rst|
docs/index.rst|
{#- Required until the `TOFS_pattern.rst` template is fixed #}
{%- elif semrel_formula == 'ssf' %}
ssf/files/default/docs/TOFS_pattern.rst|
{%- endif %}
)$
additional_dependencies: [pygments==2.9.0]
2 changes: 1 addition & 1 deletion ssf/files/default/Gemfile.lock
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ssf/files/default/docs/CONTRIBUTING.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ To preserve good formatting of these notes, the following format is prescribed:

An example of that:

.. code-block:: git
.. code-block:: console

...

Expand Down
2 changes: 2 additions & 0 deletions ssf/files/default/test/integration/share/inspec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ supports:
- platform-name: oracle
- platform-name: arch
- platform-name: gentoo
- platform-name: almalinux
- platform-name: rocky
- platform: windows
2 changes: 1 addition & 1 deletion ssf/files/default/test/integration/share/libraries/system.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion ssf/files/tofs_openssh-formula/Gemfile.lock
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ssf/files/tofs_openvpn-formula/Gemfile.lock
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ssf/files/tofs_ssf-formula/docs/CONTRIBUTING.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ To preserve good formatting of these notes, the following format is prescribed:

An example of that:

.. code-block:: git
.. code-block:: console

...

Expand Down
Loading