diff --git a/.travis.yml b/.travis.yml index 45d3012..4b73144 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,13 +64,17 @@ jobs: # - env: INSTANCE=default-fedora-31-master-py3 # - env: INSTANCE=default-opensuse-leap-151-master-py3 # - env: INSTANCE=default-amazonlinux-2-master-py3 - # - env: INSTANCE=default-debian-10-3000-1-py3 - - env: INSTANCE=default-ubuntu-1804-3000-1-py3 - # - env: INSTANCE=default-centos-8-3000-1-py3 - # - env: INSTANCE=default-fedora-31-3000-1-py3 - - env: INSTANCE=default-opensuse-leap-151-3000-1-py3 - - env: INSTANCE=default-amazonlinux-2-3000-1-py3 - # - env: INSTANCE=default-arch-base-latest-3000-1-py2 + # - env: INSTANCE=default-debian-10-3000-2-py3 + # - env: INSTANCE=default-debian-9-3000-2-py3 + - env: INSTANCE=default-ubuntu-1804-3000-2-py3 + # - env: INSTANCE=default-centos-8-3000-2-py3 + # - env: INSTANCE=default-centos-7-3000-2-py3 + # - env: INSTANCE=default-fedora-31-3000-2-py3 + - env: INSTANCE=default-opensuse-leap-151-3000-2-py3 + - env: INSTANCE=default-amazonlinux-2-3000-2-py3 + # - env: INSTANCE=default-ubuntu-1804-3000-2-py2 + # - env: INSTANCE=default-ubuntu-1604-3000-2-py2 + # - env: INSTANCE=default-arch-base-latest-3000-2-py2 # - env: INSTANCE=default-debian-10-2019-2-py3 # - env: INSTANCE=default-debian-9-2019-2-py3 # - env: INSTANCE=default-ubuntu-1804-2019-2-py3 @@ -80,19 +84,9 @@ jobs: - env: INSTANCE=default-fedora-31-2019-2-py3 # - env: INSTANCE=default-opensuse-leap-151-2019-2-py3 # - env: INSTANCE=default-amazonlinux-2-2019-2-py3 - # - env: INSTANCE=default-ubuntu-1804-2019-2-py2 + # - env: INSTANCE=default-centos-6-2019-2-py2 # - env: INSTANCE=default-amazonlinux-1-2019-2-py2 - # - env: INSTANCE=default-arch-base-latest-2019-2-py2 - # - env: INSTANCE=default-centos-7-2018-3-py3 - # - env: INSTANCE=default-fedora-30-2018-3-py3 - # - env: INSTANCE=default-debian-9-2018-3-py2 - # - env: INSTANCE=default-debian-8-2018-3-py2 - # - env: INSTANCE=default-ubuntu-1804-2018-3-py2 - # - env: INSTANCE=default-ubuntu-1604-2018-3-py2 - # - env: INSTANCE=default-centos-6-2018-3-py2 - # - env: INSTANCE=default-opensuse-leap-151-2018-3-py2 - # - env: INSTANCE=default-amazonlinux-1-2018-3-py2 - - env: INSTANCE=default-arch-base-latest-2018-3-py2 + - env: INSTANCE=default-arch-base-latest-2019-2-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index 5dd9f6c..206a661 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -36,33 +36,45 @@ platforms: driver: image: netmanagers/salt-master-py3:amazonlinux-2 - ## SALT `3000.1` - - name: debian-10-3000-1-py3 + ## SALT `3000.2` + - name: debian-10-3000-2-py3 driver: - image: netmanagers/salt-3000.1-py3:debian-10 - - name: ubuntu-1804-3000-1-py3 + image: netmanagers/salt-3000.2-py3:debian-10 + - name: debian-9-3000-2-py3 driver: - image: netmanagers/salt-3000.1-py3:ubuntu-18.04 - - name: centos-8-3000-1-py3 + image: netmanagers/salt-3000.2-py3:debian-9 + - name: ubuntu-1804-3000-2-py3 driver: - image: netmanagers/salt-3000.1-py3:centos-8 - - name: fedora-31-3000-1-py3 + image: netmanagers/salt-3000.2-py3:ubuntu-18.04 + - name: centos-8-3000-2-py3 driver: - image: netmanagers/salt-3000.1-py3:fedora-31 - - name: opensuse-leap-151-3000-1-py3 + image: netmanagers/salt-3000.2-py3:centos-8 + - name: centos-7-3000-2-py3 driver: - image: netmanagers/salt-3000.1-py3:opensuse-leap-15.1 + image: netmanagers/salt-3000.2-py3:centos-7 + - name: fedora-31-3000-2-py3 + driver: + image: netmanagers/salt-3000.2-py3:fedora-31 + - name: opensuse-leap-151-3000-2-py3 + driver: + image: netmanagers/salt-3000.2-py3:opensuse-leap-15.1 run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3000-1-py3 + - name: amazonlinux-2-3000-2-py3 driver: - image: netmanagers/salt-3000.1-py3:amazonlinux-2 - - name: arch-base-latest-3000-1-py2 + image: netmanagers/salt-3000.2-py3:amazonlinux-2 + - name: ubuntu-1804-3000-2-py2 driver: - image: netmanagers/salt-3000.1-py2:arch-base-latest + image: netmanagers/salt-3000.2-py2:ubuntu-18.04 + - name: ubuntu-1604-3000-2-py2 + driver: + image: netmanagers/salt-3000.2-py2:ubuntu-16.04 + - name: arch-base-latest-3000-2-py2 + driver: + image: netmanagers/salt-3000.2-py2:arch-base-latest run_command: /usr/lib/systemd/systemd ## SALT `2019.2` @@ -98,9 +110,10 @@ platforms: - name: amazonlinux-2-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:amazonlinux-2 - - name: ubuntu-1804-2019-2-py2 + - name: centos-6-2019-2-py2 driver: - image: netmanagers/salt-2019.2-py2:ubuntu-18.04 + image: netmanagers/salt-2019.2-py2:centos-6 + run_command: /sbin/init - name: amazonlinux-1-2019-2-py2 driver: image: netmanagers/salt-2019.2-py2:amazonlinux-1 @@ -110,46 +123,6 @@ platforms: image: netmanagers/salt-2019.2-py2:arch-base-latest run_command: /usr/lib/systemd/systemd - ## SALT `2018.3` - - name: centos-7-2018-3-py3 - driver: - image: netmanagers/salt-2018.3-py3:centos-7 - - name: fedora-30-2018-3-py3 - driver: - image: netmanagers/salt-2018.3-py3:fedora-30 - - name: debian-9-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:debian-9 - - name: debian-8-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:debian-8 - - name: ubuntu-1804-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:ubuntu-18.04 - - name: ubuntu-1604-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:ubuntu-16.04 - - name: centos-6-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:centos-6 - run_command: /sbin/init - - name: opensuse-leap-151-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1 - run_command: /usr/lib/systemd/systemd - # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 - - name: amazonlinux-1-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:amazonlinux-1 - run_command: /sbin/init - - name: arch-base-latest-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:arch-base-latest - run_command: /usr/lib/systemd/systemd - provisioner: name: salt_solo log_level: debug