Merge pull request #299 from litnialex/master
ci(travis): Ubuntu upgrade from 16 to 18 & 20
This commit is contained in:
@@ -59,7 +59,8 @@ jobs:
|
|||||||
# Make sure the instances listed below match up with
|
# Make sure the instances listed below match up with
|
||||||
# the `platforms` defined in `kitchen.yml`
|
# the `platforms` defined in `kitchen.yml`
|
||||||
- env: INSTANCE=default-debian-10-master-py3
|
- env: INSTANCE=default-debian-10-master-py3
|
||||||
# - env: INSTANCE=default-ubuntu-1804-master-py3
|
- env: INSTANCE=default-ubuntu-2004-master-py3
|
||||||
|
- env: INSTANCE=default-ubuntu-1804-master-py3
|
||||||
# - env: INSTANCE=default-centos-8-master-py3
|
# - env: INSTANCE=default-centos-8-master-py3
|
||||||
# - env: INSTANCE=default-fedora-31-master-py3
|
# - env: INSTANCE=default-fedora-31-master-py3
|
||||||
# - env: INSTANCE=default-opensuse-leap-151-master-py3
|
# - env: INSTANCE=default-opensuse-leap-151-master-py3
|
||||||
@@ -75,7 +76,6 @@ jobs:
|
|||||||
# - env: INSTANCE=default-arch-base-latest-2019-2-py2
|
# - env: INSTANCE=default-arch-base-latest-2019-2-py2
|
||||||
# - env: INSTANCE=default-fedora-30-2018-3-py3
|
# - env: INSTANCE=default-fedora-30-2018-3-py3
|
||||||
# - env: INSTANCE=default-debian-9-2018-3-py2
|
# - env: INSTANCE=default-debian-9-2018-3-py2
|
||||||
- env: INSTANCE=default-ubuntu-1604-2018-3-py2
|
|
||||||
# - env: INSTANCE=default-centos-7-2018-3-py2
|
# - env: INSTANCE=default-centos-7-2018-3-py2
|
||||||
- env: INSTANCE=default-opensuse-leap-151-2018-3-py2
|
- env: INSTANCE=default-opensuse-leap-151-2018-3-py2
|
||||||
# - env: INSTANCE=default-amazonlinux-1-2018-3-py2
|
# - env: INSTANCE=default-amazonlinux-1-2018-3-py2
|
||||||
|
|||||||
@@ -15,6 +15,9 @@ platforms:
|
|||||||
- name: debian-10-master-py3
|
- name: debian-10-master-py3
|
||||||
driver:
|
driver:
|
||||||
image: saltimages/salt-master-py3:debian-10
|
image: saltimages/salt-master-py3:debian-10
|
||||||
|
- name: ubuntu-2004-master-py3
|
||||||
|
driver:
|
||||||
|
image: saltimages/salt-master-py3:ubuntu-20.04
|
||||||
- name: ubuntu-1804-master-py3
|
- name: ubuntu-1804-master-py3
|
||||||
driver:
|
driver:
|
||||||
image: saltimages/salt-master-py3:ubuntu-18.04
|
image: saltimages/salt-master-py3:ubuntu-18.04
|
||||||
|
|||||||
Reference in New Issue
Block a user