From 5c4692a0df94155b4ec922af032a5b6aa6b96d87 Mon Sep 17 00:00:00 2001 From: Daniel Tomcej Date: Fri, 18 May 2018 16:30:03 -0600 Subject: [PATCH] Modify tests to only run if non-static files have been modified --- .semaphoreci/cleanup.sh | 4 ++++ .semaphoreci/job1.sh | 6 ++++++ .semaphoreci/job2.sh | 8 ++++++++ .semaphoreci/setup.sh | 17 +++++++++++------ .semaphoreci/tests.sh | 6 ------ 5 files changed, 29 insertions(+), 12 deletions(-) create mode 100755 .semaphoreci/cleanup.sh create mode 100755 .semaphoreci/job1.sh create mode 100755 .semaphoreci/job2.sh delete mode 100755 .semaphoreci/tests.sh diff --git a/.semaphoreci/cleanup.sh b/.semaphoreci/cleanup.sh new file mode 100755 index 000000000..bf92be1f9 --- /dev/null +++ b/.semaphoreci/cleanup.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -e + +sudo rm -rf static diff --git a/.semaphoreci/job1.sh b/.semaphoreci/job1.sh new file mode 100755 index 000000000..e8b806800 --- /dev/null +++ b/.semaphoreci/job1.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -e + +if [ -n "$SHOULD_TEST" ]; then ci_retry make pull-images; fi + +if [ -n "$SHOULD_TEST" ]; then ci_retry make test-integration; fi diff --git a/.semaphoreci/job2.sh b/.semaphoreci/job2.sh new file mode 100755 index 000000000..68c21a281 --- /dev/null +++ b/.semaphoreci/job2.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +set -e + +ci_retry make validate + +if [ -n "$SHOULD_TEST" ]; then ci_retry make test-unit; fi + +if [ -n "$SHOULD_TEST" ]; then make -j${N_MAKE_JOBS} crossbinary-default-parallel; fi diff --git a/.semaphoreci/setup.sh b/.semaphoreci/setup.sh index 2989e9143..fdc545fe1 100755 --- a/.semaphoreci/setup.sh +++ b/.semaphoreci/setup.sh @@ -1,11 +1,16 @@ #!/usr/bin/env bash set -e -sudo -E apt-get -yq update -sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install docker-ce=${DOCKER_VERSION}* -docker version +export DOCKER_VERSION=17.03.1 -pip install --user -r requirements.txt +source .semaphoreci/vars -make pull-images -ci_retry make validate +if [ -z "${PULL_REQUEST_NUMBER}" ]; then SHOULD_TEST="-*-"; else TEMP_STORAGE=$(curl --silent https://patch-diff.githubusercontent.com/raw/containous/traefik/pull/${PULL_REQUEST_NUMBER}.diff | patch --dry-run -p1 -R); fi + +if [ -n "$TEMP_STORAGE" ]; then SHOULD_TEST=$(echo $TEMP_STORAGE | grep -Ev '(.md|.yaml|.yml)' || :); fi + +if [ -n "$SHOULD_TEST" ]; then sudo -E apt-get -yq update; fi + +if [ -n "$SHOULD_TEST" ]; then sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install docker-ce=${DOCKER_VERSION}*; fi + +if [ -n "$SHOULD_TEST" ]; then docker version; fi diff --git a/.semaphoreci/tests.sh b/.semaphoreci/tests.sh deleted file mode 100755 index 2a586ccf6..000000000 --- a/.semaphoreci/tests.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e - -make test-unit -ci_retry make test-integration -make -j${N_MAKE_JOBS} crossbinary-default-parallel