Просмотр исходного кода

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

* Automated using https://github.com/myii/ssf-formula/pull/299
pull/23/head
Imran Iqbal 3 лет назад
Родитель
Сommit
52b0b387c9
Аккаунт пользователя с таким Email не найден
3 измененных файлов: 68 добавлений и 68 удалений
  1. +17
    -17
      .gitlab-ci.yml
  2. +16
    -16
      .travis.yml
  3. +35
    -35
      kitchen.yml

+ 17
- 17
.gitlab-ci.yml Просмотреть файл

@@ -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
@@ -133,22 +133,22 @@ 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-ubuntu-1604-master-py3: {extends: '.test_instance'}
# default-debian-10-3002-2-py3: {extends: '.test_instance'}
# default-debian-9-3002-2-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
# default-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
# default-debian-10-3001-4-py3: {extends: '.test_instance'}
# default-debian-9-3001-4-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
# default-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
# default-debian-10-3000-6-py3: {extends: '.test_instance'}
# default-debian-9-3000-6-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
# default-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
# default-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
# default-debian-10-3002-5-py3: {extends: '.test_instance'}
# default-debian-9-3002-5-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3002-5-py3: {extends: '.test_instance'}
# default-ubuntu-1604-3002-5-py3: {extends: '.test_instance'}
# default-debian-10-3001-6-py3: {extends: '.test_instance'}
# default-debian-9-3001-6-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3001-6-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3001-6-py3: {extends: '.test_instance'}
# default-ubuntu-1604-3001-6-py3: {extends: '.test_instance'}
# default-debian-10-3000-8-py3: {extends: '.test_instance'}
# default-debian-9-3000-8-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3000-8-py3: {extends: '.test_instance'}
# default-ubuntu-1604-3000-8-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3000-8-py2: {extends: '.test_instance'}
# default-ubuntu-1604-3000-8-py2: {extends: '.test_instance'}

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

+ 16
- 16
.travis.yml Просмотреть файл

@@ -93,22 +93,22 @@ jobs:
- env: INSTANCE=default-ubuntu-2004-master-py3
- env: INSTANCE=default-ubuntu-1804-master-py3
- env: INSTANCE=default-ubuntu-1604-master-py3
# - env: INSTANCE=default-debian-10-3002-2-py3
# - env: INSTANCE=default-debian-9-3002-2-py3
# - env: INSTANCE=default-ubuntu-2004-3002-2-py3
# - env: INSTANCE=default-ubuntu-1804-3002-2-py3
# - env: INSTANCE=default-ubuntu-1604-3002-2-py3
# - env: INSTANCE=default-debian-10-3001-4-py3
# - env: INSTANCE=default-debian-9-3001-4-py3
# - env: INSTANCE=default-ubuntu-2004-3001-4-py3
# - env: INSTANCE=default-ubuntu-1804-3001-4-py3
# - env: INSTANCE=default-ubuntu-1604-3001-4-py3
# - env: INSTANCE=default-debian-10-3000-6-py3
# - env: INSTANCE=default-debian-9-3000-6-py3
# - env: INSTANCE=default-ubuntu-1804-3000-6-py3
# - env: INSTANCE=default-ubuntu-1604-3000-6-py3
# - env: INSTANCE=default-ubuntu-1804-3000-6-py2
# - env: INSTANCE=default-ubuntu-1604-3000-6-py2
# - env: INSTANCE=default-debian-10-3002-5-py3
# - env: INSTANCE=default-debian-9-3002-5-py3
# - env: INSTANCE=default-ubuntu-2004-3002-5-py3
# - env: INSTANCE=default-ubuntu-1804-3002-5-py3
# - env: INSTANCE=default-ubuntu-1604-3002-5-py3
# - env: INSTANCE=default-debian-10-3001-6-py3
# - env: INSTANCE=default-debian-9-3001-6-py3
# - env: INSTANCE=default-ubuntu-2004-3001-6-py3
# - env: INSTANCE=default-ubuntu-1804-3001-6-py3
# - env: INSTANCE=default-ubuntu-1604-3001-6-py3
# - env: INSTANCE=default-debian-10-3000-8-py3
# - env: INSTANCE=default-debian-9-3000-8-py3
# - env: INSTANCE=default-ubuntu-1804-3000-8-py3
# - env: INSTANCE=default-ubuntu-1604-3000-8-py3
# - env: INSTANCE=default-ubuntu-1804-3000-8-py2
# - env: INSTANCE=default-ubuntu-1604-3000-8-py2

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

+ 35
- 35
kitchen.yml Просмотреть файл

@@ -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

Загрузка…
Отмена
Сохранить