Skip to content

Commit 90904e4

Browse files
committedFeb 14, 2020
Merge branch 'release/4.2.0'
2 parents 5cfe142 + 77c0ac9 commit 90904e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1153
-648
lines changed
 

‎.travis.lxd.yml

-51
This file was deleted.

‎.travis.yml

+17-9
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,41 @@
11
---
22

3+
os: linux
4+
35
dist: bionic
46

5-
language: minimal
7+
language: shell
68

79
env:
8-
matrix:
10+
jobs:
911
- MOLECULE_SCENARIO_NAME="centos-7"
1012
- MOLECULE_SCENARIO_NAME="suse-15"
1113
- MOLECULE_SCENARIO_NAME="ubuntu-16.04"
1214
- MOLECULE_SCENARIO_NAME="ubuntu-18.04"
15+
- MOLECULE_SCENARIO_NAME="ubuntu-19.10"
1316

14-
matrix:
17+
jobs:
1518
allow_failures:
1619
- env: MOLECULE_SCENARIO_NAME="centos-7"
1720
- env: MOLECULE_SCENARIO_NAME="suse-15"
1821

1922
before_install:
2023
- |
21-
sudo apt-get -y purge lxc-* lxd-* && sudo apt-get -y autoremove
22-
sudo apt-get update && sudo apt-get install -y snapd
23-
sudo snap refresh && sudo snap install lxd
24-
sudo lxd init --preseed < .travis.lxd.yml
24+
curl -Os https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.deb
25+
curl -Os https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_SHA256SUMS
26+
curl -Os https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_SHA256SUMS.sig
27+
gpg --receive-key 51852D87348FFC4C
28+
gpg --verify vagrant_2.2.7_SHA256SUMS.sig vagrant_2.2.7_SHA256SUMS
29+
sha256sum -c vagrant_2.2.7_SHA256SUMS 2>&1 | grep OK
30+
sudo apt-get update && sudo apt-get install -y bridge-utils dnsmasq-base ebtables libvirt-bin libvirt-dev qemu-kvm qemu-utils ruby-dev
31+
sudo dpkg -i vagrant_2.2.7_x86_64.deb
32+
sudo vagrant plugin install vagrant-libvirt
2533
2634
- |
2735
sudo apt-get -y purge python3-openssl && sudo apt-get -y autoremove
28-
sudo apt-get update && sudo apt-get -y install curl gcc libffi-dev libssl-dev make python3 python3-dev
36+
sudo apt-get update && sudo apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
2937
curl -skL https://bootstrap.pypa.io/get-pip.py | sudo -H python3
30-
sudo -H pip3 install --upgrade --ignore-installed --requirement requirements.txt
38+
sudo -H pip3 install --upgrade --ignore-installed --requirement requirements.txt
3139
3240
install:
3341
- |

0 commit comments

Comments
 (0)