Browse Source

ci(kitchen+ci): update with latest CVE pre-salted images [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/374
tags/v0.10.4
Imran Iqbal 3 years ago
parent
commit
9762abfb4d
No account linked to committer's email address
4 changed files with 60 additions and 85 deletions
  1. +1
    -0
      .gitignore
  2. +14
    -18
      .gitlab-ci.yml
  3. +14
    -18
      .travis.yml
  4. +31
    -49
      kitchen.yml

+ 1
- 0
.gitignore View File

# `salt-formula` -- Vagrant Specific files # `salt-formula` -- Vagrant Specific files
.vagrant .vagrant
top.sls top.sls
!test/salt/pillar/top.sls


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

+ 14
- 18
.gitlab-ci.yml View File

# preferences-ubuntu-1804-master-py3: {extends: '.test_instance'} # preferences-ubuntu-1804-master-py3: {extends: '.test_instance'}
# unattended-ubuntu-1804-master-py3: {extends: '.test_instance'} # unattended-ubuntu-1804-master-py3: {extends: '.test_instance'}
ubuntu-1804-master-py3: {extends: '.test_instance'} ubuntu-1804-master-py3: {extends: '.test_instance'}
# repositories-debian-11-3003-2-py3: {extends: '.test_instance'}
# repositories-debian-10-3003-2-py3: {extends: '.test_instance'}
# repositories-debian-9-3003-2-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
# repositories-debian-11-3002-6-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'}
# repositories-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
# repositories-debian-10-3001-7-py3: {extends: '.test_instance'}
# repositories-debian-9-3001-7-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
# repositories-debian-10-3000-9-py3: {extends: '.test_instance'}
# repositories-debian-9-3000-9-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
# repositories-debian-11-3003-3-py3: {extends: '.test_instance'}
# repositories-debian-10-3003-3-py3: {extends: '.test_instance'}
# repositories-debian-9-3003-3-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
# repositories-debian-11-3002-7-py3: {extends: '.test_instance'}
# repositories-debian-10-3002-7-py3: {extends: '.test_instance'}
# repositories-debian-9-3002-7-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
# repositories-debian-10-3001-8-py3: {extends: '.test_instance'}
# repositories-debian-9-3001-8-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}


############################################################################### ###############################################################################
# `release` stage: `semantic-release` # `release` stage: `semantic-release`

+ 14
- 18
.travis.yml View File

# - env: INSTANCE=preferences-ubuntu-1804-master-py3 # - env: INSTANCE=preferences-ubuntu-1804-master-py3
# - env: INSTANCE=unattended-ubuntu-1804-master-py3 # - env: INSTANCE=unattended-ubuntu-1804-master-py3
- env: INSTANCE=ubuntu-1804-master-py3 - env: INSTANCE=ubuntu-1804-master-py3
# - env: INSTANCE=repositories-debian-11-3003-2-py3
# - env: INSTANCE=repositories-debian-10-3003-2-py3
# - env: INSTANCE=repositories-debian-9-3003-2-py3
# - env: INSTANCE=repositories-ubuntu-2004-3003-2-py3
# - env: INSTANCE=repositories-ubuntu-1804-3003-2-py3
# - env: INSTANCE=repositories-debian-11-3002-6-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
# - env: INSTANCE=repositories-ubuntu-1804-3002-6-py3
# - env: INSTANCE=repositories-debian-10-3001-7-py3
# - env: INSTANCE=repositories-debian-9-3001-7-py3
# - env: INSTANCE=repositories-ubuntu-2004-3001-7-py3
# - env: INSTANCE=repositories-ubuntu-1804-3001-7-py3
# - env: INSTANCE=repositories-debian-10-3000-9-py3
# - env: INSTANCE=repositories-debian-9-3000-9-py3
# - env: INSTANCE=repositories-ubuntu-1804-3000-9-py3
# - env: INSTANCE=repositories-ubuntu-1804-3000-9-py2
# - env: INSTANCE=repositories-debian-11-3003-3-py3
# - env: INSTANCE=repositories-debian-10-3003-3-py3
# - env: INSTANCE=repositories-debian-9-3003-3-py3
# - env: INSTANCE=repositories-ubuntu-2004-3003-3-py3
# - env: INSTANCE=repositories-ubuntu-1804-3003-3-py3
# - env: INSTANCE=repositories-debian-11-3002-7-py3
# - env: INSTANCE=repositories-debian-10-3002-7-py3
# - env: INSTANCE=repositories-debian-9-3002-7-py3
# - env: INSTANCE=repositories-ubuntu-2004-3002-7-py3
# - env: INSTANCE=repositories-ubuntu-1804-3002-7-py3
# - env: INSTANCE=repositories-debian-10-3001-8-py3
# - env: INSTANCE=repositories-debian-9-3001-8-py3
# - env: INSTANCE=repositories-ubuntu-2004-3001-8-py3
# - env: INSTANCE=repositories-ubuntu-1804-3001-8-py3


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

+ 31
- 49
kitchen.yml View File

image: saltimages/salt-master-py3:ubuntu-18.04 image: saltimages/salt-master-py3:ubuntu-18.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd


## SALT `3003.2`
- name: debian-11-3003-2-py3
## SALT `3003.3`
- name: debian-11-3003-3-py3
driver: driver:
image: saltimages/salt-3003.2-py3:debian-11
image: saltimages/salt-3003.3-py3:debian-11
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: debian-10-3003-2-py3
- name: debian-10-3003-3-py3
driver: driver:
image: saltimages/salt-3003.2-py3:debian-10
image: saltimages/salt-3003.3-py3:debian-10
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: debian-9-3003-2-py3
- name: debian-9-3003-3-py3
driver: driver:
image: saltimages/salt-3003.2-py3:debian-9
image: saltimages/salt-3003.3-py3:debian-9
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-2004-3003-2-py3
- name: ubuntu-2004-3003-3-py3
driver: driver:
image: saltimages/salt-3003.2-py3:ubuntu-20.04
image: saltimages/salt-3003.3-py3:ubuntu-20.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-1804-3003-2-py3
- name: ubuntu-1804-3003-3-py3
driver: driver:
image: saltimages/salt-3003.2-py3:ubuntu-18.04
image: saltimages/salt-3003.3-py3:ubuntu-18.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd


## SALT `3002.6`
- name: debian-11-3002-6-py3
## SALT `3002.7`
- name: debian-11-3002-7-py3
driver: driver:
image: saltimages/salt-3002.6-py3:debian-11
image: saltimages/salt-3002.7-py3:debian-11
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: debian-10-3002-6-py3
- name: debian-10-3002-7-py3
driver: driver:
image: saltimages/salt-3002.6-py3:debian-10
image: saltimages/salt-3002.7-py3:debian-10
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: debian-9-3002-6-py3
- name: debian-9-3002-7-py3
driver: driver:
image: saltimages/salt-3002.6-py3:debian-9
image: saltimages/salt-3002.7-py3:debian-9
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-2004-3002-6-py3
- name: ubuntu-2004-3002-7-py3
driver: driver:
image: saltimages/salt-3002.6-py3:ubuntu-20.04
image: saltimages/salt-3002.7-py3:ubuntu-20.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-1804-3002-6-py3
- name: ubuntu-1804-3002-7-py3
driver: driver:
image: saltimages/salt-3002.6-py3:ubuntu-18.04
image: saltimages/salt-3002.7-py3:ubuntu-18.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd


## SALT `3001.7`
- name: debian-10-3001-7-py3
## SALT `3001.8`
- name: debian-10-3001-8-py3
driver: driver:
image: saltimages/salt-3001.7-py3:debian-10
image: saltimages/salt-3001.8-py3:debian-10
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: debian-9-3001-7-py3
- name: debian-9-3001-8-py3
driver: driver:
image: saltimages/salt-3001.7-py3:debian-9
image: saltimages/salt-3001.8-py3:debian-9
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-2004-3001-7-py3
- name: ubuntu-2004-3001-8-py3
driver: driver:
image: saltimages/salt-3001.7-py3:ubuntu-20.04
image: saltimages/salt-3001.8-py3:ubuntu-20.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-1804-3001-7-py3
- name: ubuntu-1804-3001-8-py3
driver: driver:
image: saltimages/salt-3001.7-py3:ubuntu-18.04
run_command: /lib/systemd/systemd

## SALT `3000.9`
- name: debian-10-3000-9-py3
driver:
image: saltimages/salt-3000.9-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3000-9-py3
driver:
image: saltimages/salt-3000.9-py3:debian-9
run_command: /lib/systemd/systemd
- name: ubuntu-1804-3000-9-py3
driver:
image: saltimages/salt-3000.9-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
- name: ubuntu-1804-3000-9-py2
driver:
image: saltimages/salt-3000.9-py2:ubuntu-18.04
image: saltimages/salt-3001.8-py3:ubuntu-18.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd


verifier: verifier:

Loading…
Cancel
Save