From 44568a680602fb61f157b74dc05f9af9b153e8e6 Mon Sep 17 00:00:00 2001 From: LitniAlex Date: Wed, 15 Jul 2020 04:58:52 +0300 Subject: [PATCH 1/2] ci(travis): ubuntu upgrade from 16 to 18 & 20 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec479c1..80af254 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,8 @@ jobs: # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` - 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-fedora-31-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-fedora-30-2018-3-py3 # - 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-opensuse-leap-151-2018-3-py2 # - env: INSTANCE=default-amazonlinux-1-2018-3-py2 From 79789765439bb0727521dc817fe9eaebba000a67 Mon Sep 17 00:00:00 2001 From: LitniAlex Date: Wed, 15 Jul 2020 05:39:30 +0300 Subject: [PATCH 2/2] ci(kitchen): ubuntu-2004-master-py3 added --- kitchen.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kitchen.yml b/kitchen.yml index efcf50a..98b46b1 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -15,6 +15,9 @@ platforms: - name: debian-10-master-py3 driver: 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 driver: image: saltimages/salt-master-py3:ubuntu-18.04