From 5c29ac1cb77447225cebb48cf94fb4c205b429a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20S=C3=BCberkr=C3=BCb?= <dev@timsueberkrueb.io>
Date: Sat, 3 Mar 2018 17:30:05 +0100
Subject: [PATCH] Fix CI Use LXC instead of Docker

---
 .travis.yml                | 17 +++++++++++++----
 scripts/container_utils.py | 25 +++++++------------------
 scripts/run_tests.py       |  3 ++-
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0adb102..e2304eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,21 @@
 sudo: required
 dist: trusty
-services:
-  - docker
+sudo: required
 language: python
 python:
   - "3.5"
 install:
   - pip install click pycodestyle
 script:
-  - python3 ./scripts/run_tests.py --build-docker-images --docker --verbose
-  - python3 ./scripts/check_code_style.py
+  - sudo apt-get update
+  - sudo apt-get install --yes snapd
+  - sudo apt-get remove --yes lxd lxd-client
+  - sudo snap install core
+  - sudo snap install lxd
+  - for i in $(seq 12); do sudo /snap/bin/lxd waitready --timeout=10 >/dev/null 2>&1 && break; done
+  - sudo /snap/bin/lxd init --auto
+  - sudo /snap/bin/lxc network create testbr0
+  - sudo /snap/bin/lxc network attach-profile testbr0 default eth0
+  - export PATH="/snap/bin:$PATH"
+  - sudo env "PATH=$PATH" python3.5 ./scripts/run_tests.py --lxd --verbose
+  - python3.5 ./scripts/check_code_style.py
diff --git a/scripts/container_utils.py b/scripts/container_utils.py
index b3f2211..6e9a00b 100644
--- a/scripts/container_utils.py
+++ b/scripts/container_utils.py
@@ -53,21 +53,10 @@ def docker_wait_for_snapd(container_name):
 
 def lxd_wait_for_network(container_name):
     print('Waiting for a network connection ...')
-    connected = False
-    retry_count = 25
-    network_probe = 'import urllib.request; urllib.request.urlopen("{}", timeout=5)' \
-        .format('http://start.ubuntu.com/connectivity-check.html')
-    while not connected:
-        time.sleep(1)
-        try:
-            result = subprocess.check_call(
-                ['lxc', 'exec', container_name, '--',
-                 'python3', '-c', "'" + network_probe + "'"]
-            )
-            connected = result == 0
-        except subprocess.CalledProcessError:
-            connected = False
-            retry_count -= 1
-            if retry_count == 0:
-                raise ConnectionError("No network connection")
-    print('Network connection established')
+    result = subprocess.check_call(
+        ['lxc', 'exec', container_name, '--',
+         'sh', '-c', "for i in {1..50}; do ping -c1 www.ubuntu.com &> /dev/null && break; done"]
+    )
+    time.sleep(5)
+    if result == 0:
+        print('Network connection established')
diff --git a/scripts/run_tests.py b/scripts/run_tests.py
index ee734a2..bcc07d1 100755
--- a/scripts/run_tests.py
+++ b/scripts/run_tests.py
@@ -16,7 +16,8 @@
 
 SUPPORTED_UBUNTU_RELEASES = (
     'xenial',    # 16.04
-    'artful',    # 17.10
+    # FIXME: Disabled right
+    # 'artful',    # 17.10
 )