Skip to content

Commit ef4870e

Browse files
myiimyii
committed
ci(kitchen+ci): update with latest CVE pre-salted images [skip ci]
* Automated using myii/ssf-formula#374
1 parent aa5ac4f commit ef4870e

File tree

4 files changed

+68
-94
lines changed

4 files changed

+68
-94
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ tmp/
127127
# `salt-formula` -- Vagrant Specific files
128128
.vagrant
129129
top.sls
130+
!test/salt/pillar/top.sls
130131

131132
# `suricata-formula` -- Platform binaries
132133
*.rpm

‎.gitlab-ci.yml‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -137,27 +137,22 @@ default-oraclelinux-8-master-py3: {extends: '.test_instance'}
137137
default-oraclelinux-7-master-py3: {extends: '.test_instance'}
138138
default-almalinux-8-master-py3: {extends: '.test_instance'}
139139
default-rockylinux-8-master-py3: {extends: '.test_instance'}
140-
# default-centos-8-3003-2-py3: {extends: '.test_instance'}
141-
# default-centos-7-3003-2-py3: {extends: '.test_instance'}
142-
# default-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
143-
# default-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
144-
# default-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
145-
# default-almalinux-8-3003-2-py3: {extends: '.test_instance'}
146-
# default-centos-8-3002-6-py3: {extends: '.test_instance'}
147-
# default-centos-7-3002-6-py3: {extends: '.test_instance'}
148-
# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
149-
# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
150-
# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
151-
# default-centos-8-3001-7-py3: {extends: '.test_instance'}
152-
# default-centos-7-3001-7-py3: {extends: '.test_instance'}
153-
# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
154-
# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
155-
# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
156-
# default-centos-8-3000-9-py3: {extends: '.test_instance'}
157-
# default-centos-7-3000-9-py3: {extends: '.test_instance'}
158-
# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
159-
# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
160-
# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
140+
# default-centos-8-3003-3-py3: {extends: '.test_instance'}
141+
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
142+
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
143+
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
144+
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
145+
# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
146+
# default-centos-8-3002-7-py3: {extends: '.test_instance'}
147+
# default-centos-7-3002-7-py3: {extends: '.test_instance'}
148+
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
149+
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
150+
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
151+
# default-centos-8-3001-8-py3: {extends: '.test_instance'}
152+
# default-centos-7-3001-8-py3: {extends: '.test_instance'}
153+
# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
154+
# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
155+
# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
161156

162157
###############################################################################
163158
# `release` stage: `semantic-release`

‎.travis.yml‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -97,27 +97,22 @@ jobs:
9797
- env: INSTANCE=default-oraclelinux-7-master-py3
9898
- env: INSTANCE=default-almalinux-8-master-py3
9999
- env: INSTANCE=default-rockylinux-8-master-py3
100-
# - env: INSTANCE=default-centos-8-3003-2-py3
101-
# - env: INSTANCE=default-centos-7-3003-2-py3
102-
# - env: INSTANCE=default-amazonlinux-2-3003-2-py3
103-
# - env: INSTANCE=default-oraclelinux-8-3003-2-py3
104-
# - env: INSTANCE=default-oraclelinux-7-3003-2-py3
105-
# - env: INSTANCE=default-almalinux-8-3003-2-py3
106-
# - env: INSTANCE=default-centos-8-3002-6-py3
107-
# - env: INSTANCE=default-centos-7-3002-6-py3
108-
# - env: INSTANCE=default-amazonlinux-2-3002-6-py3
109-
# - env: INSTANCE=default-oraclelinux-8-3002-6-py3
110-
# - env: INSTANCE=default-oraclelinux-7-3002-6-py3
111-
# - env: INSTANCE=default-centos-8-3001-7-py3
112-
# - env: INSTANCE=default-centos-7-3001-7-py3
113-
# - env: INSTANCE=default-amazonlinux-2-3001-7-py3
114-
# - env: INSTANCE=default-oraclelinux-8-3001-7-py3
115-
# - env: INSTANCE=default-oraclelinux-7-3001-7-py3
116-
# - env: INSTANCE=default-centos-8-3000-9-py3
117-
# - env: INSTANCE=default-centos-7-3000-9-py3
118-
# - env: INSTANCE=default-amazonlinux-2-3000-9-py3
119-
# - env: INSTANCE=default-oraclelinux-8-3000-9-py3
120-
# - env: INSTANCE=default-oraclelinux-7-3000-9-py3
100+
# - env: INSTANCE=default-centos-8-3003-3-py3
101+
# - env: INSTANCE=default-centos-7-3003-3-py3
102+
# - env: INSTANCE=default-amazonlinux-2-3003-3-py3
103+
# - env: INSTANCE=default-oraclelinux-8-3003-3-py3
104+
# - env: INSTANCE=default-oraclelinux-7-3003-3-py3
105+
# - env: INSTANCE=default-almalinux-8-3003-3-py3
106+
# - env: INSTANCE=default-centos-8-3002-7-py3
107+
# - env: INSTANCE=default-centos-7-3002-7-py3
108+
# - env: INSTANCE=default-amazonlinux-2-3002-7-py3
109+
# - env: INSTANCE=default-oraclelinux-8-3002-7-py3
110+
# - env: INSTANCE=default-oraclelinux-7-3002-7-py3
111+
# - env: INSTANCE=default-centos-8-3001-8-py3
112+
# - env: INSTANCE=default-centos-7-3001-8-py3
113+
# - env: INSTANCE=default-amazonlinux-2-3001-8-py3
114+
# - env: INSTANCE=default-oraclelinux-8-3001-8-py3
115+
# - env: INSTANCE=default-oraclelinux-7-3001-8-py3
121116

122117
## Define the release stage that runs `semantic-release`
123118
- stage: 'release'

‎kitchen.yml‎

Lines changed: 35 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -66,76 +66,59 @@ platforms:
6666
driver:
6767
image: saltimages/salt-master-py3:rockylinux-8
6868

69-
## SALT `3003.2`
70-
- name: centos-8-3003-2-py3
69+
## SALT `3003.3`
70+
- name: centos-8-3003-3-py3
7171
driver:
72-
image: saltimages/salt-3003.2-py3:centos-8
73-
- name: centos-7-3003-2-py3
72+
image: saltimages/salt-3003.3-py3:centos-8
73+
- name: centos-7-3003-3-py3
7474
driver:
75-
image: saltimages/salt-3003.2-py3:centos-7
76-
- name: amazonlinux-2-3003-2-py3
75+
image: saltimages/salt-3003.3-py3:centos-7
76+
- name: amazonlinux-2-3003-3-py3
7777
driver:
78-
image: saltimages/salt-3003.2-py3:amazonlinux-2
79-
- name: oraclelinux-8-3003-2-py3
78+
image: saltimages/salt-3003.3-py3:amazonlinux-2
79+
- name: oraclelinux-8-3003-3-py3
8080
driver:
81-
image: saltimages/salt-3003.2-py3:oraclelinux-8
82-
- name: oraclelinux-7-3003-2-py3
81+
image: saltimages/salt-3003.3-py3:oraclelinux-8
82+
- name: oraclelinux-7-3003-3-py3
8383
driver:
84-
image: saltimages/salt-3003.2-py3:oraclelinux-7
85-
- name: almalinux-8-3003-2-py3
84+
image: saltimages/salt-3003.3-py3:oraclelinux-7
85+
- name: almalinux-8-3003-3-py3
8686
driver:
87-
image: saltimages/salt-3003.2-py3:almalinux-8
87+
image: saltimages/salt-3003.3-py3:almalinux-8
8888

89-
## SALT `3002.6`
90-
- name: centos-8-3002-6-py3
89+
## SALT `3002.7`
90+
- name: centos-8-3002-7-py3
9191
driver:
92-
image: saltimages/salt-3002.6-py3:centos-8
93-
- name: centos-7-3002-6-py3
92+
image: saltimages/salt-3002.7-py3:centos-8
93+
- name: centos-7-3002-7-py3
9494
driver:
95-
image: saltimages/salt-3002.6-py3:centos-7
96-
- name: amazonlinux-2-3002-6-py3
95+
image: saltimages/salt-3002.7-py3:centos-7
96+
- name: amazonlinux-2-3002-7-py3
9797
driver:
98-
image: saltimages/salt-3002.6-py3:amazonlinux-2
99-
- name: oraclelinux-8-3002-6-py3
98+
image: saltimages/salt-3002.7-py3:amazonlinux-2
99+
- name: oraclelinux-8-3002-7-py3
100100
driver:
101-
image: saltimages/salt-3002.6-py3:oraclelinux-8
102-
- name: oraclelinux-7-3002-6-py3
101+
image: saltimages/salt-3002.7-py3:oraclelinux-8
102+
- name: oraclelinux-7-3002-7-py3
103103
driver:
104-
image: saltimages/salt-3002.6-py3:oraclelinux-7
104+
image: saltimages/salt-3002.7-py3:oraclelinux-7
105105

106-
## SALT `3001.7`
107-
- name: centos-8-3001-7-py3
106+
## SALT `3001.8`
107+
- name: centos-8-3001-8-py3
108108
driver:
109-
image: saltimages/salt-3001.7-py3:centos-8
110-
- name: centos-7-3001-7-py3
109+
image: saltimages/salt-3001.8-py3:centos-8
110+
- name: centos-7-3001-8-py3
111111
driver:
112-
image: saltimages/salt-3001.7-py3:centos-7
113-
- name: amazonlinux-2-3001-7-py3
112+
image: saltimages/salt-3001.8-py3:centos-7
113+
- name: amazonlinux-2-3001-8-py3
114114
driver:
115-
image: saltimages/salt-3001.7-py3:amazonlinux-2
116-
- name: oraclelinux-8-3001-7-py3
115+
image: saltimages/salt-3001.8-py3:amazonlinux-2
116+
- name: oraclelinux-8-3001-8-py3
117117
driver:
118-
image: saltimages/salt-3001.7-py3:oraclelinux-8
119-
- name: oraclelinux-7-3001-7-py3
118+
image: saltimages/salt-3001.8-py3:oraclelinux-8
119+
- name: oraclelinux-7-3001-8-py3
120120
driver:
121-
image: saltimages/salt-3001.7-py3:oraclelinux-7
122-
123-
## SALT `3000.9`
124-
- name: centos-8-3000-9-py3
125-
driver:
126-
image: saltimages/salt-3000.9-py3:centos-8
127-
- name: centos-7-3000-9-py3
128-
driver:
129-
image: saltimages/salt-3000.9-py3:centos-7
130-
- name: amazonlinux-2-3000-9-py3
131-
driver:
132-
image: saltimages/salt-3000.9-py3:amazonlinux-2
133-
- name: oraclelinux-8-3000-9-py3
134-
driver:
135-
image: saltimages/salt-3000.9-py3:oraclelinux-8
136-
- name: oraclelinux-7-3000-9-py3
137-
driver:
138-
image: saltimages/salt-3000.9-py3:oraclelinux-7
121+
image: saltimages/salt-3001.8-py3:oraclelinux-7
139122

140123
verifier:
141124
# https://www.inspec.io/

0 commit comments

Comments
 (0)