Parcourir la source

ci(kitchen+gitlab-ci): use latest pre-salted images [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/293
tags/v1.7.5
Imran Iqbal il y a 3 ans
Parent
révision
fb9901e3ac
Aucun compte lié à l'adresse e-mail de l'auteur
6 fichiers modifiés avec 15 ajouts et 2 suppressions
  1. +3
    -0
      .gitlab-ci.yml
  2. +3
    -0
      .travis.yml
  3. +6
    -2
      kitchen.yml
  4. +1
    -0
      test/integration/v3000-py2/inspec.yml
  5. +1
    -0
      test/integration/v3001-py3/inspec.yml
  6. +1
    -0
      test/integration/v3002-py3/inspec.yml

+ 3
- 0
.gitlab-ci.yml Voir le fichier

v3002-py3-amazonlinux-2-3002-2-py3: {extends: '.test_instance'} v3002-py3-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-8-3002-2-py3: {extends: '.test_instance'} v3002-py3-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-7-3002-2-py3: {extends: '.test_instance'} v3002-py3-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
# v3002-py3-arch-base-latest-3002-2-py3: {extends: '.test_instance'}
v3002-py3-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'} v3002-py3-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
v3002-py3-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'} v3002-py3-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'}
v3001-py3-debian-10-3001-4-py3: {extends: '.test_instance'} v3001-py3-debian-10-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-amazonlinux-2-3001-4-py3: {extends: '.test_instance'} # v3001-py3-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
v3001-py3-oraclelinux-8-3001-4-py3: {extends: '.test_instance'} v3001-py3-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-oraclelinux-7-3001-4-py3: {extends: '.test_instance'} # v3001-py3-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-arch-base-latest-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'} # v3001-py3-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'} # v3001-py3-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'}
# v3000-py3-debian-10-3000-6-py3: {extends: '.test_instance'} # v3000-py3-debian-10-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'} # v3000-py3-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'}
# v3000-py2-ubuntu-1804-3000-6-py2: {extends: '.test_instance'} # v3000-py2-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
v3000-py2-ubuntu-1604-3000-6-py2: {extends: '.test_instance'} v3000-py2-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
# v3000-py2-arch-base-latest-3000-6-py2: {extends: '.test_instance'}


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

+ 3
- 0
.travis.yml Voir le fichier

- env: INSTANCE=v3002-py3-amazonlinux-2-3002-2-py3 - env: INSTANCE=v3002-py3-amazonlinux-2-3002-2-py3
- env: INSTANCE=v3002-py3-oraclelinux-8-3002-2-py3 - env: INSTANCE=v3002-py3-oraclelinux-8-3002-2-py3
- env: INSTANCE=v3002-py3-oraclelinux-7-3002-2-py3 - env: INSTANCE=v3002-py3-oraclelinux-7-3002-2-py3
# - env: INSTANCE=v3002-py3-arch-base-latest-3002-2-py3
- env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-2-py3 - env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-2-py3
- env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-2-py3 - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-2-py3
- env: INSTANCE=v3001-py3-debian-10-3001-4-py3 - env: INSTANCE=v3001-py3-debian-10-3001-4-py3
# - env: INSTANCE=v3001-py3-amazonlinux-2-3001-4-py3 # - env: INSTANCE=v3001-py3-amazonlinux-2-3001-4-py3
- env: INSTANCE=v3001-py3-oraclelinux-8-3001-4-py3 - env: INSTANCE=v3001-py3-oraclelinux-8-3001-4-py3
# - env: INSTANCE=v3001-py3-oraclelinux-7-3001-4-py3 # - env: INSTANCE=v3001-py3-oraclelinux-7-3001-4-py3
# - env: INSTANCE=v3001-py3-arch-base-latest-3001-4-py3
# - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-4-py3 # - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-4-py3
# - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-4-py3 # - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-4-py3
# - env: INSTANCE=v3000-py3-debian-10-3000-6-py3 # - env: INSTANCE=v3000-py3-debian-10-3000-6-py3
# - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-6-py3 # - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-6-py3
# - env: INSTANCE=v3000-py2-ubuntu-1804-3000-6-py2 # - env: INSTANCE=v3000-py2-ubuntu-1804-3000-6-py2
- env: INSTANCE=v3000-py2-ubuntu-1604-3000-6-py2 - env: INSTANCE=v3000-py2-ubuntu-1604-3000-6-py2
# - env: INSTANCE=v3000-py2-arch-base-latest-3000-6-py2


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

+ 6
- 2
kitchen.yml Voir le fichier

privileged: true privileged: true
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd


# Make sure the platforms listed below match up with
# the `env.matrix` instances defined in `.travis.yml`
platforms: platforms:
## SALT `tiamat` ## SALT `tiamat`
- name: debian-10-tiamat-py3 - name: debian-10-tiamat-py3
- name: oraclelinux-8-master-py3 - name: oraclelinux-8-master-py3
driver: driver:
image: saltimages/salt-master-py3:oraclelinux-8 image: saltimages/salt-master-py3:oraclelinux-8
- name: oraclelinux-7-master-py3
driver:
image: saltimages/salt-master-py3:oraclelinux-7
- name: gentoo-stage3-latest-master-py3 - name: gentoo-stage3-latest-master-py3
driver: driver:
image: saltimages/salt-master-py3:gentoo-stage3-latest image: saltimages/salt-master-py3:gentoo-stage3-latest
- amazonlinux-2-3002-2-py3 - amazonlinux-2-3002-2-py3
- oraclelinux-8-3002-2-py3 - oraclelinux-8-3002-2-py3
- oraclelinux-7-3002-2-py3 - oraclelinux-7-3002-2-py3
- arch-base-latest-3002-2-py3
- gentoo-stage3-latest-3002-2-py3 - gentoo-stage3-latest-3002-2-py3
- gentoo-stage3-systemd-3002-2-py3 - gentoo-stage3-systemd-3002-2-py3
provisioner: provisioner:
- amazonlinux-2-3001-4-py3 - amazonlinux-2-3001-4-py3
- oraclelinux-8-3001-4-py3 - oraclelinux-8-3001-4-py3
- oraclelinux-7-3001-4-py3 - oraclelinux-7-3001-4-py3
- arch-base-latest-3001-4-py3
- gentoo-stage3-latest-3001-4-py3 - gentoo-stage3-latest-3001-4-py3
- gentoo-stage3-systemd-3001-4-py3 - gentoo-stage3-systemd-3001-4-py3
provisioner: provisioner:
includes: includes:
- ubuntu-1804-3000-6-py2 - ubuntu-1804-3000-6-py2
- ubuntu-1604-3000-6-py2 - ubuntu-1604-3000-6-py2
- arch-base-latest-3000-6-py2
provisioner: provisioner:
state_top: state_top:
base: base:

+ 1
- 0
test/integration/v3000-py2/inspec.yml Voir le fichier

- platform-name: oracle - platform-name: oracle
- platform-name: arch - platform-name: arch
- platform-name: gentoo - platform-name: gentoo
- platform: windows

+ 1
- 0
test/integration/v3001-py3/inspec.yml Voir le fichier

- platform-name: oracle - platform-name: oracle
- platform-name: arch - platform-name: arch
- platform-name: gentoo - platform-name: gentoo
- platform: windows

+ 1
- 0
test/integration/v3002-py3/inspec.yml Voir le fichier

- platform-name: oracle - platform-name: oracle
- platform-name: arch - platform-name: arch
- platform-name: gentoo - platform-name: gentoo
- platform: windows

Chargement…
Annuler
Enregistrer