Skip to content

Commit

Permalink
ci(kitchen+gitlab): update for new pre-salted images [skip ci]
Browse files Browse the repository at this point in the history
* Automated using myii/ssf-formula#410
  • Loading branch information
myii committed Feb 2, 2022
1 parent 43ce964 commit 6fc41f8
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 38 deletions.
6 changes: 0 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,20 +145,14 @@ default-ubuntu-1804-master-py3: {extends: '.test_instance'}
# default-debian-9-3004-0-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
# default-debian-11-3003-3-py3: {extends: '.test_instance'}
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
# default-debian-11-3002-7-py3: {extends: '.test_instance'}
# default-debian-10-3002-7-py3: {extends: '.test_instance'}
# default-debian-9-3002-7-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
# default-debian-10-3001-8-py3: {extends: '.test_instance'}
# default-debian-9-3001-8-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}

###############################################################################
# `release` stage: `semantic-release`
Expand Down
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,14 @@ jobs:
# - env: INSTANCE=default-debian-9-3004-0-py3
# - env: INSTANCE=default-ubuntu-2004-3004-0-py3
# - env: INSTANCE=default-ubuntu-1804-3004-0-py3
# - env: INSTANCE=default-debian-11-3003-3-py3
# - env: INSTANCE=default-debian-10-3003-3-py3
# - env: INSTANCE=default-debian-9-3003-3-py3
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
# - env: INSTANCE=default-debian-11-3002-7-py3
# - env: INSTANCE=default-debian-10-3002-7-py3
# - env: INSTANCE=default-debian-9-3002-7-py3
# - env: INSTANCE=default-ubuntu-2004-3002-7-py3
# - env: INSTANCE=default-ubuntu-1804-3002-7-py3
# - env: INSTANCE=default-debian-10-3001-8-py3
# - env: INSTANCE=default-debian-9-3001-8-py3
# - env: INSTANCE=default-ubuntu-2004-3001-8-py3
# - env: INSTANCE=default-ubuntu-1804-3001-8-py3

## Define the release stage that runs `semantic-release`
- stage: 'release'
Expand Down
26 changes: 0 additions & 26 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@ platforms:
run_command: /lib/systemd/systemd

## SALT `3003.3`
- name: debian-11-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:debian-11
run_command: /lib/systemd/systemd
- name: debian-10-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:debian-10
Expand All @@ -108,10 +104,6 @@ platforms:
run_command: /lib/systemd/systemd

## SALT `3002.7`
- name: debian-11-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:debian-11
run_command: /lib/systemd/systemd
- name: debian-10-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:debian-10
Expand All @@ -129,24 +121,6 @@ platforms:
image: saltimages/salt-3002.7-py3:ubuntu-18.04
run_command: /lib/systemd/systemd

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

verifier:
# https://www.inspec.io/
name: inspec
Expand Down

0 comments on commit 6fc41f8

Please sign in to comment.