Skip to content

Commit

Permalink
ci(kitchen+ci): use latest pre-salted images (after CVE) [skip ci]
Browse files Browse the repository at this point in the history 
* Automated using myii/ssf-formula#299
  • Loading branch information
@myii
myii committed Mar 7, 2021
1 parent 3a909b7 commit d5c38c1
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 68 deletions.
34 changes: 17 additions & 17 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ variables:
DOCKER_DRIVER: 'overlay2'

###############################################################################
# `lint` stage: `commitlint` & `pre-commit`
# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed)
###############################################################################
commitlint:
stage: *stage_lint
Expand Down Expand Up @@ -148,22 +148,22 @@ ubuntu-1804-master-py3: {extends: '.test_instance'}
# preferences-ubuntu-1604-master-py3: {extends: '.test_instance'}
# unattended-ubuntu-1604-master-py3: {extends: '.test_instance'}
ubuntu-1604-master-py3: {extends: '.test_instance'}
# repositories-debian-10-3002-2-py3: {extends: '.test_instance'}
# repositories-debian-9-3002-2-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
# repositories-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
# repositories-debian-10-3001-4-py3: {extends: '.test_instance'}
# repositories-debian-9-3001-4-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
# repositories-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
# repositories-debian-10-3000-6-py3: {extends: '.test_instance'}
# repositories-debian-9-3000-6-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
# repositories-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
# repositories-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
# repositories-debian-10-3002-5-py3: {extends: '.test_instance'}
# repositories-debian-9-3002-5-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3002-5-py3: {extends: '.test_instance'}
# repositories-ubuntu-1604-3002-5-py3: {extends: '.test_instance'}
# repositories-debian-10-3001-6-py3: {extends: '.test_instance'}
# repositories-debian-9-3001-6-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3001-6-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3001-6-py3: {extends: '.test_instance'}
# repositories-ubuntu-1604-3001-6-py3: {extends: '.test_instance'}
# repositories-debian-10-3000-8-py3: {extends: '.test_instance'}
# repositories-debian-9-3000-8-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3000-8-py3: {extends: '.test_instance'}
# repositories-ubuntu-1604-3000-8-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3000-8-py2: {extends: '.test_instance'}
# repositories-ubuntu-1604-3000-8-py2: {extends: '.test_instance'}

###############################################################################
# `release` stage: `semantic-release`
Expand Down
32 changes: 16 additions & 16 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,22 +108,22 @@ jobs:
# - env: INSTANCE=preferences-ubuntu-1604-master-py3
# - env: INSTANCE=unattended-ubuntu-1604-master-py3
- env: INSTANCE=ubuntu-1604-master-py3
# - env: INSTANCE=repositories-debian-10-3002-2-py3
# - env: INSTANCE=repositories-debian-9-3002-2-py3
# - env: INSTANCE=repositories-ubuntu-2004-3002-2-py3
# - env: INSTANCE=repositories-ubuntu-1804-3002-2-py3
# - env: INSTANCE=repositories-ubuntu-1604-3002-2-py3
# - env: INSTANCE=repositories-debian-10-3001-4-py3
# - env: INSTANCE=repositories-debian-9-3001-4-py3
# - env: INSTANCE=repositories-ubuntu-2004-3001-4-py3
# - env: INSTANCE=repositories-ubuntu-1804-3001-4-py3
# - env: INSTANCE=repositories-ubuntu-1604-3001-4-py3
# - env: INSTANCE=repositories-debian-10-3000-6-py3
# - env: INSTANCE=repositories-debian-9-3000-6-py3
# - env: INSTANCE=repositories-ubuntu-1804-3000-6-py3
# - env: INSTANCE=repositories-ubuntu-1604-3000-6-py3
# - env: INSTANCE=repositories-ubuntu-1804-3000-6-py2
# - env: INSTANCE=repositories-ubuntu-1604-3000-6-py2
# - env: INSTANCE=repositories-debian-10-3002-5-py3
# - env: INSTANCE=repositories-debian-9-3002-5-py3
# - env: INSTANCE=repositories-ubuntu-2004-3002-5-py3
# - env: INSTANCE=repositories-ubuntu-1804-3002-5-py3
# - env: INSTANCE=repositories-ubuntu-1604-3002-5-py3
# - env: INSTANCE=repositories-debian-10-3001-6-py3
# - env: INSTANCE=repositories-debian-9-3001-6-py3
# - env: INSTANCE=repositories-ubuntu-2004-3001-6-py3
# - env: INSTANCE=repositories-ubuntu-1804-3001-6-py3
# - env: INSTANCE=repositories-ubuntu-1604-3001-6-py3
# - env: INSTANCE=repositories-debian-10-3000-8-py3
# - env: INSTANCE=repositories-debian-9-3000-8-py3
# - env: INSTANCE=repositories-ubuntu-1804-3000-8-py3
# - env: INSTANCE=repositories-ubuntu-1604-3000-8-py3
# - env: INSTANCE=repositories-ubuntu-1804-3000-8-py2
# - env: INSTANCE=repositories-ubuntu-1604-3000-8-py2

## Define the release stage that runs `semantic-release`
- stage: 'release'
Expand Down
70 changes: 35 additions & 35 deletions kitchen.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,59 +43,59 @@ platforms:
driver:
image: saltimages/salt-master-py3:ubuntu-16.04

## SALT `3002.2`
- name: debian-10-3002-2-py3
## SALT `3002.5`
- name: debian-10-3002-5-py3
driver:
image: saltimages/salt-3002.2-py3:debian-10
- name: debian-9-3002-2-py3
image: saltimages/salt-3002.5-py3:debian-10
- name: debian-9-3002-5-py3
driver:
image: saltimages/salt-3002.2-py3:debian-9
- name: ubuntu-2004-3002-2-py3
image: saltimages/salt-3002.5-py3:debian-9
- name: ubuntu-2004-3002-5-py3
driver:
image: saltimages/salt-3002.2-py3:ubuntu-20.04
- name: ubuntu-1804-3002-2-py3
image: saltimages/salt-3002.5-py3:ubuntu-20.04
- name: ubuntu-1804-3002-5-py3
driver:
image: saltimages/salt-3002.2-py3:ubuntu-18.04
- name: ubuntu-1604-3002-2-py3
image: saltimages/salt-3002.5-py3:ubuntu-18.04
- name: ubuntu-1604-3002-5-py3
driver:
image: saltimages/salt-3002.2-py3:ubuntu-16.04
image: saltimages/salt-3002.5-py3:ubuntu-16.04

## SALT `3001.4`
- name: debian-10-3001-4-py3
## SALT `3001.6`
- name: debian-10-3001-6-py3
driver:
image: saltimages/salt-3001.4-py3:debian-10
- name: debian-9-3001-4-py3
image: saltimages/salt-3001.6-py3:debian-10
- name: debian-9-3001-6-py3
driver:
image: saltimages/salt-3001.4-py3:debian-9
- name: ubuntu-2004-3001-4-py3
image: saltimages/salt-3001.6-py3:debian-9
- name: ubuntu-2004-3001-6-py3
driver:
image: saltimages/salt-3001.4-py3:ubuntu-20.04
- name: ubuntu-1804-3001-4-py3
image: saltimages/salt-3001.6-py3:ubuntu-20.04
- name: ubuntu-1804-3001-6-py3
driver:
image: saltimages/salt-3001.4-py3:ubuntu-18.04
- name: ubuntu-1604-3001-4-py3
image: saltimages/salt-3001.6-py3:ubuntu-18.04
- name: ubuntu-1604-3001-6-py3
driver:
image: saltimages/salt-3001.4-py3:ubuntu-16.04
image: saltimages/salt-3001.6-py3:ubuntu-16.04

## SALT `3000.6`
- name: debian-10-3000-6-py3
## SALT `3000.8`
- name: debian-10-3000-8-py3
driver:
image: saltimages/salt-3000.6-py3:debian-10
- name: debian-9-3000-6-py3
image: saltimages/salt-3000.8-py3:debian-10
- name: debian-9-3000-8-py3
driver:
image: saltimages/salt-3000.6-py3:debian-9
- name: ubuntu-1804-3000-6-py3
image: saltimages/salt-3000.8-py3:debian-9
- name: ubuntu-1804-3000-8-py3
driver:
image: saltimages/salt-3000.6-py3:ubuntu-18.04
- name: ubuntu-1604-3000-6-py3
image: saltimages/salt-3000.8-py3:ubuntu-18.04
- name: ubuntu-1604-3000-8-py3
driver:
image: saltimages/salt-3000.6-py3:ubuntu-16.04
- name: ubuntu-1804-3000-6-py2
image: saltimages/salt-3000.8-py3:ubuntu-16.04
- name: ubuntu-1804-3000-8-py2
driver:
image: saltimages/salt-3000.6-py2:ubuntu-18.04
- name: ubuntu-1604-3000-6-py2
image: saltimages/salt-3000.8-py2:ubuntu-18.04
- name: ubuntu-1604-3000-8-py2
driver:
image: saltimages/salt-3000.6-py2:ubuntu-16.04
image: saltimages/salt-3000.8-py2:ubuntu-16.04

provisioner:
name: salt_solo
Expand Down

0 comments on commit d5c38c1

Please sign in to comment.