Browse Source

ci(kitchen+ci): update with `3004` pre-salted images/boxes [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/385
master
Imran Iqbal 3 years ago
parent
commit
3673641c91
No account linked to committer's email address
4 changed files with 41 additions and 1 deletions
  1. +13
    -1
      .gitlab-ci.yml
  2. +5
    -0
      .travis.yml
  3. +1
    -0
      CODEOWNERS
  4. +22
    -0
      kitchen.yml

+ 13
- 1
.gitlab-ci.yml View File

############################################################################### ###############################################################################
# Define `test` template # Define `test` template
############################################################################### ###############################################################################
.test_instance:
.test_instance: &test_instance
stage: *stage_test stage: *stage_test
image: *image_dindruby image: *image_dindruby
services: *services_docker_dind services: *services_docker_dind
# Alternative value to consider: `${CI_JOB_NAME}` # Alternative value to consider: `${CI_JOB_NAME}`
- 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"' - 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'


###############################################################################
# Define `test` template (`allow_failure: true`)
###############################################################################
.test_instance_failure_permitted:
<<: *test_instance
allow_failure: true

############################################################################### ###############################################################################
# `test` stage: each instance below uses the `test` template above # `test` stage: each instance below uses the `test` template above
############################################################################### ###############################################################################
default-debian-9-master-py3: {extends: '.test_instance'} default-debian-9-master-py3: {extends: '.test_instance'}
default-ubuntu-2004-master-py3: {extends: '.test_instance'} default-ubuntu-2004-master-py3: {extends: '.test_instance'}
default-ubuntu-1804-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-11-3003-3-py3: {extends: '.test_instance'} # default-debian-11-3003-3-py3: {extends: '.test_instance'}
# default-debian-10-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-debian-9-3003-3-py3: {extends: '.test_instance'}

+ 5
- 0
.travis.yml View File

- env: INSTANCE=default-debian-9-master-py3 - env: INSTANCE=default-debian-9-master-py3
- env: INSTANCE=default-ubuntu-2004-master-py3 - env: INSTANCE=default-ubuntu-2004-master-py3
- env: INSTANCE=default-ubuntu-1804-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-11-3003-3-py3 # - env: INSTANCE=default-debian-11-3003-3-py3
# - env: INSTANCE=default-debian-10-3003-3-py3 # - env: INSTANCE=default-debian-10-3003-3-py3
# - env: INSTANCE=default-debian-9-3003-3-py3 # - env: INSTANCE=default-debian-9-3003-3-py3

+ 1
- 0
CODEOWNERS View File

/test/integration/**/libraries/system.rb @saltstack-formulas/ssf /test/integration/**/libraries/system.rb @saltstack-formulas/ssf
/test/integration/**/inspec.yml @saltstack-formulas/ssf /test/integration/**/inspec.yml @saltstack-formulas/ssf
/test/integration/**/README.md @saltstack-formulas/ssf /test/integration/**/README.md @saltstack-formulas/ssf
/test/salt/pillar/top.sls @saltstack-formulas/ssf
/.gitignore @saltstack-formulas/ssf /.gitignore @saltstack-formulas/ssf
/.cirrus.yml @saltstack-formulas/ssf /.cirrus.yml @saltstack-formulas/ssf
/.gitlab-ci.yml @saltstack-formulas/ssf /.gitlab-ci.yml @saltstack-formulas/ssf

+ 22
- 0
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 `3004.0`
- name: debian-11-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:debian-11
run_command: /lib/systemd/systemd
- name: debian-10-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:debian-9
run_command: /lib/systemd/systemd
- name: ubuntu-2004-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: ubuntu-1804-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:ubuntu-18.04
run_command: /lib/systemd/systemd

## SALT `3003.3` ## SALT `3003.3`
- name: debian-11-3003-3-py3 - name: debian-11-3003-3-py3
driver: driver:

Loading…
Cancel
Save