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#426
  • Loading branch information
myii committed Apr 3, 2022
1 parent e844a20 commit a85cb04
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 55 deletions.
26 changes: 13 additions & 13 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,19 +141,19 @@ default-debian-10-master-py3: {extends: '.test_instance'}
default-debian-9-master-py3: {extends: '.test_instance'}
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
default-ubuntu-1804-master-py3: {extends: '.test_instance'}
# default-debian-11-3004-0-py3: {extends: '.test_instance'}
# default-debian-10-3004-0-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-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-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-11-3004-1-py3: {extends: '.test_instance'}
# default-debian-10-3004-1-py3: {extends: '.test_instance'}
# default-debian-9-3004-1-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
# default-debian-10-3003-4-py3: {extends: '.test_instance'}
# default-debian-9-3003-4-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
# default-debian-10-3002-8-py3: {extends: '.test_instance'}
# default-debian-9-3002-8-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
# yamllint enable rule:line-length

###############################################################################
Expand Down
26 changes: 13 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,19 @@ jobs:
- env: INSTANCE=default-debian-9-master-py3
- env: INSTANCE=default-ubuntu-2004-master-py3
- env: INSTANCE=default-ubuntu-1804-master-py3
# - env: INSTANCE=default-debian-11-3004-0-py3
# - env: INSTANCE=default-debian-10-3004-0-py3
# - 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-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-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-11-3004-1-py3
# - env: INSTANCE=default-debian-10-3004-1-py3
# - env: INSTANCE=default-debian-9-3004-1-py3
# - env: INSTANCE=default-ubuntu-2004-3004-1-py3
# - env: INSTANCE=default-ubuntu-1804-3004-1-py3
# - env: INSTANCE=default-debian-10-3003-4-py3
# - env: INSTANCE=default-debian-9-3003-4-py3
# - env: INSTANCE=default-ubuntu-2004-3003-4-py3
# - env: INSTANCE=default-ubuntu-1804-3003-4-py3
# - env: INSTANCE=default-debian-10-3002-8-py3
# - env: INSTANCE=default-debian-9-3002-8-py3
# - env: INSTANCE=default-ubuntu-2004-3002-8-py3
# - env: INSTANCE=default-ubuntu-1804-3002-8-py3

## Define the release stage that runs `semantic-release`
- stage: 'release'
Expand Down
58 changes: 29 additions & 29 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,62 +63,62 @@ platforms:
image: saltimages/salt-master-py3:ubuntu-18.04
run_command: /lib/systemd/systemd

## SALT `3004.0`
- name: debian-11-3004-0-py3
## SALT `3004.1`
- name: debian-11-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:debian-11
image: saltimages/salt-3004.1-py3:debian-11
run_command: /lib/systemd/systemd
- name: debian-10-3004-0-py3
- name: debian-10-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:debian-10
image: saltimages/salt-3004.1-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3004-0-py3
- name: debian-9-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:debian-9
image: saltimages/salt-3004.1-py3:debian-9
run_command: /lib/systemd/systemd
- name: ubuntu-2004-3004-0-py3
- name: ubuntu-2004-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:ubuntu-20.04
image: saltimages/salt-3004.1-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: ubuntu-1804-3004-0-py3
- name: ubuntu-1804-3004-1-py3
driver:
image: saltimages/salt-3004.0-py3:ubuntu-18.04
image: saltimages/salt-3004.1-py3:ubuntu-18.04
run_command: /lib/systemd/systemd

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

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

verifier:
Expand Down

0 comments on commit a85cb04

Please sign in to comment.