Переглянути джерело

ci(kitchen+ci): update with latest `3003.2` pre-salted images [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/360
master
Imran Iqbal 3 роки тому
джерело
коміт
375b6aac41
Аккаунт користувача з таким Email не знайдено
3 змінених файлів з 89 додано та 65 видалено
  1. +19
    -15
      .gitlab-ci.yml
  2. +19
    -15
      .travis.yml
  3. +51
    -35
      kitchen.yml

+ 19
- 15
.gitlab-ci.yml Переглянути файл

@@ -161,21 +161,25 @@ default-almalinux-8-master-py3: {extends: '.test_instance'}
# without-ipv6-almalinux-8-master-py3: {extends: '.test_instance'}
default-rockylinux-8-master-py3: {extends: '.test_instance'}
# without-ipv6-rockylinux-8-master-py3: {extends: '.test_instance'}
# default-debian-11-3003-1-py3: {extends: '.test_instance'}
# default-debian-10-3003-1-py3: {extends: '.test_instance'}
# without-ipv6-debian-9-3003-1-py3: {extends: '.test_instance'}
# without-ipv6-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
# without-ipv6-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
# default-centos-8-3003-1-py3: {extends: '.test_instance'}
# without-ipv6-centos-7-3003-1-py3: {extends: '.test_instance'}
# without-ipv6-fedora-34-3003-1-py3: {extends: '.test_instance'}
# without-ipv6-fedora-33-3003-1-py3: {extends: '.test_instance'}
# without-ipv6-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
# without-ipv6-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
# without-ipv6-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
# without-ipv6-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
# without-ipv6-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
# default-debian-11-3003-2-py3: {extends: '.test_instance'}
# default-debian-10-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-debian-9-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
# default-centos-8-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-centos-7-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-fedora-34-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-fedora-33-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-arch-base-latest-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'}
# default-almalinux-8-3003-2-py3: {extends: '.test_instance'}
# without-ipv6-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
# without-ipv6-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
# without-ipv6-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}

+ 19
- 15
.travis.yml Переглянути файл

@@ -121,21 +121,25 @@ jobs:
# - env: INSTANCE=without-ipv6-almalinux-8-master-py3
- env: INSTANCE=default-rockylinux-8-master-py3
# - env: INSTANCE=without-ipv6-rockylinux-8-master-py3
# - env: INSTANCE=default-debian-11-3003-1-py3
# - env: INSTANCE=default-debian-10-3003-1-py3
# - env: INSTANCE=without-ipv6-debian-9-3003-1-py3
# - env: INSTANCE=without-ipv6-ubuntu-2004-3003-1-py3
# - env: INSTANCE=without-ipv6-ubuntu-1804-3003-1-py3
# - env: INSTANCE=default-centos-8-3003-1-py3
# - env: INSTANCE=without-ipv6-centos-7-3003-1-py3
# - env: INSTANCE=without-ipv6-fedora-34-3003-1-py3
# - env: INSTANCE=without-ipv6-fedora-33-3003-1-py3
# - env: INSTANCE=without-ipv6-opensuse-leap-153-3003-1-py3
# - env: INSTANCE=without-ipv6-opensuse-leap-152-3003-1-py3
# - env: INSTANCE=without-ipv6-opensuse-tmbl-latest-3003-1-py3
# - env: INSTANCE=without-ipv6-amazonlinux-2-3003-1-py3
# - env: INSTANCE=default-oraclelinux-8-3003-1-py3
# - env: INSTANCE=without-ipv6-oraclelinux-7-3003-1-py3
# - env: INSTANCE=default-debian-11-3003-2-py3
# - env: INSTANCE=default-debian-10-3003-2-py3
# - env: INSTANCE=without-ipv6-debian-9-3003-2-py3
# - env: INSTANCE=without-ipv6-ubuntu-2004-3003-2-py3
# - env: INSTANCE=without-ipv6-ubuntu-1804-3003-2-py3
# - env: INSTANCE=default-centos-8-3003-2-py3
# - env: INSTANCE=without-ipv6-centos-7-3003-2-py3
# - env: INSTANCE=without-ipv6-fedora-34-3003-2-py3
# - env: INSTANCE=without-ipv6-fedora-33-3003-2-py3
# - env: INSTANCE=without-ipv6-opensuse-leap-153-3003-2-py3
# - env: INSTANCE=without-ipv6-opensuse-leap-152-3003-2-py3
# - env: INSTANCE=without-ipv6-opensuse-tmbl-latest-3003-2-py3
# - env: INSTANCE=without-ipv6-amazonlinux-2-3003-2-py3
# - env: INSTANCE=default-oraclelinux-8-3003-2-py3
# - env: INSTANCE=without-ipv6-oraclelinux-7-3003-2-py3
# - env: INSTANCE=without-ipv6-arch-base-latest-3003-2-py3
# - env: INSTANCE=without-ipv6-gentoo-stage3-latest-3003-2-py3
# - env: INSTANCE=without-ipv6-gentoo-stage3-systemd-3003-2-py3
# - env: INSTANCE=default-almalinux-8-3003-2-py3
# - env: INSTANCE=without-ipv6-arch-base-latest-3003-1-py3
# - env: INSTANCE=without-ipv6-gentoo-stage3-latest-3003-1-py3
# - env: INSTANCE=without-ipv6-gentoo-stage3-systemd-3003-1-py3

+ 51
- 35
kitchen.yml Переглянути файл

@@ -142,69 +142,84 @@ platforms:
driver:
image: saltimages/salt-master-py3:rockylinux-8

## SALT `3003.1`
- name: debian-11-3003-1-py3
## SALT `3003.2`
- name: debian-11-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:debian-11
image: saltimages/salt-3003.2-py3:debian-11
run_command: /lib/systemd/systemd
- name: debian-10-3003-1-py3
- name: debian-10-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:debian-10
image: saltimages/salt-3003.2-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3003-1-py3
- name: debian-9-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:debian-9
image: saltimages/salt-3003.2-py3:debian-9
run_command: /lib/systemd/systemd
- name: ubuntu-2004-3003-1-py3
- name: ubuntu-2004-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:ubuntu-20.04
image: saltimages/salt-3003.2-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: ubuntu-1804-3003-1-py3
- name: ubuntu-1804-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:ubuntu-18.04
image: saltimages/salt-3003.2-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
- name: centos-8-3003-1-py3
- name: centos-8-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:centos-8
- name: centos-7-3003-1-py3
image: saltimages/salt-3003.2-py3:centos-8
- name: centos-7-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:centos-7
- name: fedora-34-3003-1-py3
image: saltimages/salt-3003.2-py3:centos-7
- name: fedora-34-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:fedora-34
- name: fedora-33-3003-1-py3
image: saltimages/salt-3003.2-py3:fedora-34
- name: fedora-33-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:fedora-33
- name: opensuse-leap-153-3003-1-py3
image: saltimages/salt-3003.2-py3:fedora-33
- name: opensuse-leap-153-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:opensuse-leap-15.3
image: saltimages/salt-3003.2-py3:opensuse-leap-15.3
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: opensuse-leap-152-3003-1-py3
- name: opensuse-leap-152-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:opensuse-leap-15.2
image: saltimages/salt-3003.2-py3:opensuse-leap-15.2
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: opensuse-tmbl-latest-3003-1-py3
- name: opensuse-tmbl-latest-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest
image: saltimages/salt-3003.2-py3:opensuse-tumbleweed-latest
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: amazonlinux-2-3003-1-py3
- name: amazonlinux-2-3003-2-py3
driver:
image: saltimages/salt-3003.2-py3:amazonlinux-2
- name: oraclelinux-8-3003-2-py3
driver:
image: saltimages/salt-3003.2-py3:oraclelinux-8
- name: oraclelinux-7-3003-2-py3
driver:
image: saltimages/salt-3003.2-py3:oraclelinux-7
- name: arch-base-latest-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:amazonlinux-2
- name: oraclelinux-8-3003-1-py3
image: saltimages/salt-3003.2-py3:arch-base-latest
- name: gentoo-stage3-latest-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:oraclelinux-8
- name: oraclelinux-7-3003-1-py3
image: saltimages/salt-3003.2-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3003-2-py3
driver:
image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd
- name: almalinux-8-3003-2-py3
driver:
image: saltimages/salt-3003.1-py3:oraclelinux-7
image: saltimages/salt-3003.2-py3:almalinux-8

## SALT `3003.1`
- name: arch-base-latest-3003-1-py3
driver:
image: saltimages/salt-3003.1-py3:arch-base-latest
@@ -442,10 +457,11 @@ suites:
- oraclelinux-8-master-py3
- almalinux-8-master-py3
- rockylinux-8-master-py3
- debian-11-3003-1-py3
- debian-10-3003-1-py3
- centos-8-3003-1-py3
- oraclelinux-8-3003-1-py3
- debian-11-3003-2-py3
- debian-10-3003-2-py3
- centos-8-3003-2-py3
- oraclelinux-8-3003-2-py3
- almalinux-8-3003-2-py3
- debian-11-3002-6-py3
- debian-10-3002-6-py3
- centos-8-3002-6-py3

Завантаження…
Відмінити
Зберегти