From afc4fe32d8578d10153ef8fe47f6e80fbaf087f0 Mon Sep 17 00:00:00 2001 From: checktheroads Date: Sat, 22 Feb 2020 00:25:18 -0700 Subject: [PATCH] cleanup ci script --- .tests/DockerfileUbuntu | 2 -- .tests/dockersetup.sh | 4 +++- .travis.yml | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.tests/DockerfileUbuntu b/.tests/DockerfileUbuntu index abec97e..8bcb59b 100644 --- a/.tests/DockerfileUbuntu +++ b/.tests/DockerfileUbuntu @@ -13,10 +13,8 @@ RUN apt-get update \ && python3 --version \ && echo "NodeJS $(node --version)" \ && echo "Yarn $(yarn --version)" - # && git clone --single-branch --branch v1.0.0 --depth 1 https://github.com/checktheroads/hyperglass COPY ./ /tmp/hyperglass ENV PATH=$PATH:/root/.poetry/bin -# ENV BASH_ENV=/etc/profile exec bash FROM base as install WORKDIR /tmp/hyperglass diff --git a/.tests/dockersetup.sh b/.tests/dockersetup.sh index d238efa..f1864b1 100755 --- a/.tests/dockersetup.sh +++ b/.tests/dockersetup.sh @@ -9,8 +9,10 @@ poetry run hyperglass build-ui echo "UI build completed" echo "Starting hyperglass..." poetry run hyperglass start &> /var/log/hyperglassci.log & +sleep 10 echo "Started hyperglass" echo "Running HTTP test..." +echo "Status code:" curl -s -o /dev/null -w "%{http_code}" http://localhost:8001 -echo "Tests ran successfully" +echo "\nTests ran successfully" exit 0 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 0ea2c1e..acc74ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,3 @@ jobs: script: docker run hyperglass/ubuntu /bin/sh -c "cd /tmp/hyperglass; poetry run flake8 hyperglass" - stage: Test 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"