From cd2d8afac17a7b6879aad2e187053d06a91780b9 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 8 May 2020 12:43:23 +0100 Subject: [PATCH 1/3] feat(python38): add `ubuntu-20.04` & `fedora-32` for `master` only * Upstream `master` branch is now Sodium `3001` * Upstream issue resolved for `Python 3.8 Support`: - https://github.com/saltstack/salt/issues/55310 --- .travis.yml | 2 ++ test/integration/test_salt_version.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 14ca8e7..07d4e64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,7 @@ env: # Fedora has no python3 packages due to a tornado issue, # but they ship with Python3 since 29, so we install it using git # https://bugzilla.redhat.com/show_bug.cgi?id=1723207 + - DN=fedora DV=32 PI=dnf SIM=git SV=master PV=3 EP="python3-pip" - DN=fedora DV=31 PI=dnf SIM=git SV=master PV=3 EP="python3-pip" - DN=fedora DV=31 PI=dnf SIM=git SV=3000.3 PV=3 EP="python3-pip" - DN=fedora DV=31 PI=dnf SIM=git SV=2019.2 PV=3 EP="python3-pip" @@ -65,6 +66,7 @@ env: - DN=opensuse/leap DV=15.1 PI=zyp SIM=git SV=2019.2 PV=3 EP="python3-pip" # UBUNTU + - DN=ubuntu DV=20.04 PI=apt SIM=git SV=master PV=3 EP="python3-apt python3-pip" - DN=ubuntu DV=18.04 PI=apt SIM=git SV=master PV=3 EP="python3-apt python3-pip" - DN=ubuntu DV=18.04 PI=apt SIM=stable SV=3000.3 PV=3 EP="python3-pip" - DN=ubuntu DV=18.04 PI=apt SIM=stable SV=3000.3 PV=2 EP="python-pip" diff --git a/test/integration/test_salt_version.py b/test/integration/test_salt_version.py index 30babe3..86e6536 100644 --- a/test/integration/test_salt_version.py +++ b/test/integration/test_salt_version.py @@ -1,7 +1,7 @@ def test_salt_version(host, saltvers): cmd = host.run("salt-call --version") if saltvers in ["latest", "master"]: - saltvers = "3000" + saltvers = "3001" assert saltvers in cmd.stdout assert cmd.rc == 0 From 0781ccfb4f7394ef558cdfd6cace8c8e9d463df2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 23 May 2020 22:28:55 +0100 Subject: [PATCH 2/3] feat(opensuse): upgrade `leap-15.1` to `leap-15.2` --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 07d4e64..5962ec3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,9 +61,9 @@ env: - DN=fedora DV=31 PI=dnf SIM=git SV=2019.2 PV=3 EP="python3-pip" # OPENSUSE - - DN=opensuse/leap DV=15.1 PI=zyp SIM=git SV=master PV=3 EP="python3-pip" - - DN=opensuse/leap DV=15.1 PI=zyp SIM=git SV=3000.3 PV=3 EP="python3-pip" - - DN=opensuse/leap DV=15.1 PI=zyp SIM=git SV=2019.2 PV=3 EP="python3-pip" + - DN=opensuse/leap DV=15.2 PI=zyp SIM=git SV=master PV=3 EP="python3-pip" + - DN=opensuse/leap DV=15.2 PI=zyp SIM=git SV=3000.3 PV=3 EP="python3-pip" + - DN=opensuse/leap DV=15.2 PI=zyp SIM=git SV=2019.2 PV=3 EP="python3-pip" # UBUNTU - DN=ubuntu DV=20.04 PI=apt SIM=git SV=master PV=3 EP="python3-apt python3-pip" From ff836998c5c1eaa9e6690c56cec1f27b05164307 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 24 May 2020 01:48:29 +0100 Subject: [PATCH 3/3] ci(travis): remove inapplicable notifications for `irc` --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5962ec3..35518c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -119,9 +119,6 @@ notifications: - 'chat.freenode.net#salt-image-builder' on_success: always # default: always on_failure: always # default: always - on_start: always # default: never - on_cancel: always # default: always - on_error: always # default: always webhooks: if: 'repo = netmanagers/salt-image-builder' urls: