Skip to content

Commit

Permalink
Merge pull request #38 from myii/feat/add-new-ubuntu-fedora-opensuse-…
Browse files Browse the repository at this point in the history
…platforms

feat: add new platforms (`ubuntu-20.04`, `fedora-32` & `opensuse-leap-15.2`)
  • Loading branch information
myii authored May 25, 2020
2 parents 0f5a953 + ff83699 commit ec4a2f0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
11 changes: 5 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,18 @@ 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"

# 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"
- 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"
Expand Down Expand Up @@ -117,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:
Expand Down
2 changes: 1 addition & 1 deletion test/integration/test_salt_version.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit ec4a2f0

Please sign in to comment.