ci(kitchen+travis): use newly available pre-salted images

This commit is contained in:
Imran Iqbal 2019-04-30 12:52:59 +01:00
parent 3c53684109
commit 7b7aadc472
No known key found for this signature in database
GPG key ID: 6D8629439D2B7819
2 changed files with 57 additions and 22 deletions

View file

@ -19,15 +19,24 @@ before_install:
env: env:
matrix: matrix:
- INSTANCE: default-debian-9-2019-2-py3 - INSTANCE: default-debian-9-2019-2-py3
- INSTANCE: default-ubuntu-1804-2019-2-py3 # TODO: Re-enable this once the `systemd` service can be restarted reliably
- INSTANCE: default-centos-7-2019-2-py2 # - INSTANCE: default-ubuntu-1804-2019-2-py3
- INSTANCE: default-fedora-29-2019-2-py2 - INSTANCE: default-centos-7-2019-2-py3
- INSTANCE: default-opensuse-423-2018-3-py2 - INSTANCE: default-fedora-29-2019-2-py3
- INSTANCE: default-debian-8-2018-3-py2 - INSTANCE: default-opensuse-leap-15-2019-2-py3
- INSTANCE: default-debian-9-2018-3-py2
- INSTANCE: default-ubuntu-1604-2018-3-py2 - INSTANCE: default-ubuntu-1604-2018-3-py2
- INSTANCE: default-fedora-28-2018-3-py2 - INSTANCE: default-centos-7-2018-3-py2
- INSTANCE: default-fedora-29-2018-3-py2
# TODO: Use this when fixed instead of `opensuse-423`
# NOTE: Having to temporarily disable `opensuse-423` due to slow mirror
# - INSTANCE: default-opensuse-leap-15-2018-3-py2
# - INSTANCE: default-opensuse-423-2018-3-py2
- INSTANCE: default-debian-8-2017-7-py2 - INSTANCE: default-debian-8-2017-7-py2
- INSTANCE: default-ubuntu-1604-2017-7-py2 - INSTANCE: default-ubuntu-1604-2017-7-py2
# - INSTANCE: default-centos-7-2017-7-py2
- INSTANCE: default-fedora-28-2017-7-py2
- INSTANCE: default-opensuse-leap-42-2017-7-py2
script: script:
- bundle exec kitchen verify ${INSTANCE} - bundle exec kitchen verify ${INSTANCE}

View file

@ -17,29 +17,42 @@ platforms:
image: netmanagers/salt-2019.2-py3:debian-9 image: netmanagers/salt-2019.2-py3:debian-9
- name: ubuntu-1804-2019-2-py3 - name: ubuntu-1804-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:ubuntu-1804 image: netmanagers/salt-2019.2-py3:ubuntu-18.04
- name: centos-7-2019-2-py2 - name: centos-7-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py2:centos-7 image: netmanagers/salt-2019.2-py3:centos-7
- name: fedora-29-2019-2-py2 - name: fedora-29-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py2:fedora-29 image: netmanagers/salt-2019.2-py3:fedora-29
- name: opensuse-leap-15-2019-2-py3
driver:
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
run_command: /usr/lib/systemd/systemd
## SALT 2018.3 ## SALT 2018.3
- name: debian-9-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:debian-9
- name: ubuntu-1604-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:ubuntu-16.04
- name: centos-7-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:centos-7
- name: fedora-29-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:fedora-29
# TODO: Use this when fixed instead of `opensuse-423`
- name: opensuse-leap-15-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:opensuse-leap-15
run_command: /usr/lib/systemd/systemd
- name: opensuse-423-2018-3-py2 - name: opensuse-423-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:opensuse-423 image: netmanagers/salt-2018.3-py2:opensuse-423
provision_command:
- zypper refresh && zypper install -y net-tools
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
- name: debian-8-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:debian-8
- name: ubuntu-1604-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:ubuntu-1604
- name: fedora-28-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:fedora-28
# centos-6 guest fails on Debian hosts due to vsyscall issues, see # centos-6 guest fails on Debian hosts due to vsyscall issues, see
# https://hub.docker.com/_/centos, "A note about vsyscall" # https://hub.docker.com/_/centos, "A note about vsyscall"
# Disabled for `template-formula` because not `systemd` based # Disabled for `template-formula` because not `systemd` based
@ -54,7 +67,20 @@ platforms:
image: netmanagers/salt-2017.7-py2:debian-8 image: netmanagers/salt-2017.7-py2:debian-8
- name: ubuntu-1604-2017-7-py2 - name: ubuntu-1604-2017-7-py2
driver: driver:
image: netmanagers/salt-2017.7-py2:ubuntu-1604 image: netmanagers/salt-2017.7-py2:ubuntu-16.04
- name: centos-6-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:centos-6
run_command: /sbin/init
- name: fedora-28-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:fedora-28
- name: opensuse-leap-42-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:opensuse-leap-42
provision_command:
- zypper refresh && zypper install -y python-pip
run_command: /usr/lib/systemd/systemd
# - name: centos-6-2017-7 # - name: centos-6-2017-7
# driver: # driver:
# image: netmanagers/salt-2017.7-py2:centos-6 # image: netmanagers/salt-2017.7-py2:centos-6