From 5128c18c7662bd8fb38a8ce154e3c4b1db08d27d Mon Sep 17 00:00:00 2001
From: checktheroads <matt@allroads.io>
Date: Sat, 22 Feb 2020 00:06:35 -0700
Subject: [PATCH] fix build jobs

---
 .tests/dockersetup.sh | 11 +++++++----
 .travis.yml           | 10 +++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.tests/dockersetup.sh b/.tests/dockersetup.sh
index 15d3ec1..d238efa 100755
--- a/.tests/dockersetup.sh
+++ b/.tests/dockersetup.sh
@@ -7,7 +7,10 @@ sleep 2
 echo "Starting UI build"
 poetry run hyperglass build-ui
 echo "UI build completed"
-# echo "Starting redis..."
-# redis-server &
-# echo "Redis started"
-echo ""
+echo "Starting hyperglass..."
+poetry run hyperglass start &> /var/log/hyperglassci.log &
+echo "Started hyperglass"
+echo "Running HTTP test..."
+curl -s -o /dev/null -w "%{http_code}" http://localhost:8001
+echo "Tests ran successfully"
+exit 0
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 73dc146..0ea2c1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,9 @@ jobs:
   include:
     - stage: Lint
       script: docker run hyperglass/ubuntu /bin/sh -c "cd /tmp/hyperglass; poetry run flake8 hyperglass"
-    - stage: Setup
-      script: docker run hyperglass/ubuntu /tmp/dockersetup.sh
-    - stage: Start
-      script: docker run hyperglass/ubuntu /bin/sh -c "cd /tmp/hyperglass; poetry run hyperglass start &> /var/log/hyperglassci.log &"
     - stage: Test
-      script: docker run hyperglass/ubuntu /bin/sh -c "curl -s -o /dev/null -w "%{http_code}" http://localhost:8001"
+      script: docker run hyperglass/ubuntu /tmp/dockersetup.sh
+    # - stage: Start
+    #   script: docker run hyperglass/ubuntu /bin/sh -c "cd /tmp/hyperglass; poetry run hyperglass start &> /var/log/hyperglassci.log &"
+    # - stage: Test
+    #   script: docker run hyperglass/ubuntu /bin/sh -c "curl -s -o /dev/null -w "%{http_code}" http://localhost:8001"