Skip to content

Commit 92d4ea8

Browse files
committed
CI: Bring back acceptable tests to CI
This time we run the tests on session libvirt so we don't need to start a system daemon or anything and hopefully that also means we don't need LXC. This of course doesn't include tests that require elevated privileges (mainly the network tests) but its still better than no acceptance tests in the CI.
1 parent 2c9e9e3 commit 92d4ea8

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,28 @@ language: go
44
go:
55
- 1.11.x
66
env:
7-
- GO111MODULE=on GOFLAGS=-mod=vendor
7+
- GO111MODULE=on GOFLAGS=-mod=vendor LIBVIRT_DEFAULT_URI='qemu+unix:///session' TF_LIBVIRT_DISABLE_PRIVILEGED_TESTS=1 TF_LIBVIRT_RNG_DEV='/dev/random' TF_LOG=DEBUG
88
git:
99
depth: 1
1010
go_import_path: github.com/dmacvicar/terraform-provider-libvirt
1111
install: true
1212
before_script:
1313
- curl -sLo /tmp/terraform.zip https://releases.hashicorp.com/terraform/0.12.0/terraform_0.12.0_linux_amd64.zip
1414
- sudo unzip /tmp/terraform.zip -d /usr/local/bin
15+
- sudo bash ./travis/setup-host
1516
addons:
1617
apt:
1718
packages:
1819
- libvirt-dev
20+
- libvirt-daemon
21+
- qemu-system-x86
22+
- qemu-utils
23+
- genisoimage
1924
- xsltproc
2025
script:
2126
- make fmt-check
2227
- make vet-check
2328
- make lint-check
2429
- make tf-check
2530
- make test
31+
- make testacc TEST_ARGS="-test.failfast"

travis/setup-host

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
#!/bin/bash
22
set -x
33

4-
sudo mknod /dev/kvm c 10 232
4+
# This script is run as root
55

6-
sudo apt -t trusty-backports install -y lxd
6+
# Workaround: https://github.com/git-lfs/git-lfs/issues/3474#issuecomment-454237261
7+
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
78

8-
sudo sed -i 's/LXD_IPV4_ADDR=".*"/LXD_IPV4_ADDR="192.168.123.1"/' /etc/default/lxd-bridge
9-
sudo sed -i 's/LXD_IPV4_NETMASK=".*"/LXD_IPV4_NETMASK="255.255.255.0"/' /etc/default/lxd-bridge
10-
sudo sed -i 's/LXD_IPV4_NETWORK=".*"/LXD_IPV4_NETWORK="192.168.123.0\/24"/' /etc/default/lxd-bridge
11-
sudo sed -i 's/LXD_IPV4_DHCP_RANGE=".*"/LXD_IPV4_DHCP_RANGE="192.168.123.2,192.168.123.12"/' /etc/default/lxd-bridge
12-
sudo sed -i 's/LXD_IPV4_DHCP_MAX=".*"/LXD_IPV4_DHCP_MAX="10"/' /etc/default/lxd-bridge
13-
14-
sudo service libvirtd restart
15-
sudo service lxd restart
16-
17-
sudo lxc launch ubuntu:zesty libvirt -c security.privileged=true
18-
sudo lxc config device add libvirt code disk source=`pwd` path=code
19-
sudo lxc config device add libvirt kvm unix-char path=/dev/kvm
20-
sudo lxc info libvirt
9+
mknod /dev/kvm c 10 232

0 commit comments

Comments
 (0)