Reduce travis runtime

.travis.yml

@@ -30,7 +30,7 @@ install:
 - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
 - sudo apt-get -y install google-cloud-sdk
 - sudo apt-get -y install coreutils
-- test/e2e/travis-kube-setup.sh
+- test/e2e/travis-setup.sh
 # Needed for some integration tests
 - glide -h > /dev/null || go get github.com/Masterminds/glide
 - nats-streaming-server -h > /dev/null || go get github.com/nats-io/nats-streaming-server
@@ -48,8 +48,7 @@ script:
 # Unit and Integration tests
 - test/runtests.sh
 # End-to-end tests
-# TODO no need to rebuild (tag images with test ID and check if they exist before starting to rebuild)
-- test/e2e/travis-buildtest.sh
+- NOBUILD=true test/e2e/buildtest.sh
 
 after_script:
 - test/e2e/cleanup.sh

build/Dockerfile

@@ -1,7 +1,7 @@
 # To run (from repo root): docker build -t fission -f ./build/Dockerfile .
-ARG NOBUILD
 ARG GOLANG_VERSION=1.10.0
 FROM golang:$GOLANG_VERSION AS builder
+ARG NOBUILD
 
 WORKDIR /go/src/github.com/fission/fission-workflows
 

build/build-env/Dockerfile

@@ -1,11 +1,10 @@
+# Builders
 ARG BUNDLE_IMAGE=fission-workflows-bundle
 ARG BUNDLE_TAG=latest
 ARG FISSION_BUILDER_IMAGE=fission/builder
 ARG FISSION_TAG=0.6.0
 
-# Builders
 FROM $BUNDLE_IMAGE:$BUNDLE_TAG as workflows-bundle
-
 FROM $FISSION_BUILDER_IMAGE:$FISSION_TAG
 
 COPY --from=workflows-bundle /wfcli /usr/local/bin/wfcli

build/docker.sh

@@ -1,21 +1,13 @@
 #!/usr/bin/env bash
 
-set -e
+set -euo pipefail
 
 #
 # Builds all docker images. Usage docker.sh [<repo>] [<tag>]
 #
 BUILD_ROOT=$(dirname $0)
-
-IMAGE_REPO=$1
-if [ -z "$IMAGE_REPO" ]; then
-    IMAGE_REPO=fission
-fi
-
-IMAGE_TAG=$2
-if [ -z "$IMAGE_TAG" ]; then
-    IMAGE_TAG=latest
-fi
+IMAGE_REPO=${1:-fission}
+IMAGE_TAG=${2:-latest}
 
 # Build bundle images
 bundleImage=${IMAGE_REPO}/fission-workflows-bundle
@@ -33,7 +25,7 @@ if [ ! -z "$NOBUILD" ]; then
 fi
 echo "Building bundle..."
 docker build --tag="${bundleImage}:${IMAGE_TAG}" -f ${BUILD_ROOT}/Dockerfile \
-    --build-arg NOBUILD="${NOBUILD}" .
+    --no-cache --build-arg NOBUILD="${NOBUILD}" .
 popd
 
 # Build bundle-dependent images

build/runtime-env/Dockerfile

@@ -1,11 +1,10 @@
+# Builders
 ARG BUNDLE_IMAGE=fission-workflows-bundle
 ARG BUNDLE_TAG=latest
 ARG FISSION_BUILDER_IMAGE=fission/builder
 ARG FISSION_TAG=0.6.0
 
-# Builders
 FROM $BUNDLE_IMAGE:$BUNDLE_TAG as workflows-bundle
-
 FROM scratch
 
 COPY --from=workflows-bundle /fission-workflows-bundle /fission-workflows-bundle

test/e2e/buildtest.sh

@@ -24,27 +24,6 @@ TEST_STATUS=0
 TEST_LOGFILE_PATH=tests.log
 BIN_DIR="${BIN_DIR:-$HOME/testbin}"
 
-#
-# Deploy Fission
-# TODO use test specific namespace
-emph "Deploying Fission: helm chart '${fissionHelmId}' in namespace '${NS}'..."
-# Needs to be retried because k8s can still be busy with cleaning up
-# helm_install_fission ${fissionHelmId} ${NS} ${FISSION_VERSION} "serviceType=NodePort,pullPolicy=IfNotPresent,
-# analytics=false"
-controllerPort=31234
-routerPort=31235
-helm_install_fission ${fissionHelmId} ${NS} ${FISSION_VERSION} "controllerPort=${controllerPort},routerPort=${routerPort},pullPolicy=Always,analytics=false"
-
-# Direct CLI to the deployed cluster
-#set_environment ${NS} ${routerPort}
-emph "Fission environment: FISSION_URL: '${FISSION_URL:-EMPTY}' and FISSION_ROUTER: '${FISSION_ROUTER:-EMPTY}'"
-
-# Wait for Fission to get ready
-emph "Waiting for fission to be ready..."
-sleep 5
-retry fission fn list
-echo
-emph "Fission deployed!"
 
 #
 # Build

test/e2e/cleanup.sh

@@ -16,17 +16,17 @@ BIN_DIR="${BIN_DIR:-$HOME/testbin}"
 
 cleanup() {
     emph "Removing Fission and Fission Workflow deployments..."
-    helm_uninstall_release ${fissionWorkflowsHelmId} || true
-    helm_uninstall_release ${fissionHelmId} || true
+    helm_uninstall_release ${fissionWorkflowsHelmId} &
+    helm_uninstall_release ${fissionHelmId} &
 
     emph "Removing custom resources..."
     clean_tpr_crd_resources || true
 
     # Trigger deletion of all namespaces before waiting - for concurrency of deletion
     emph "Forcing deletion of namespaces..."
-    kubectl delete ns/${NS} > /dev/null 2>&1 # Sometimes it is not deleted by helm delete
-    kubectl delete ns/${NS_BUILDER} > /dev/null 2>&1 # Sometimes it is not deleted by helm delete
-    kubectl delete ns/${NS_FUNCTION} > /dev/null 2>&1 # Sometimes it is not deleted by helm delete
+    kubectl delete ns/${NS} > /dev/null 2>&1 & # Sometimes it is not deleted by helm delete
+    kubectl delete ns/${NS_BUILDER} > /dev/null 2>&1 & # Sometimes it is not deleted by helm delete
+    kubectl delete ns/${NS_FUNCTION} > /dev/null 2>&1 & # Sometimes it is not deleted by helm delete
 
     # Wait until all namespaces are actually deleted!
     emph "Awaiting deletion of namespaces..."
@@ -41,7 +41,9 @@ cleanup() {
 
 print_report() {
     emph "--- Test Report ---"
-    cat ${TEST_LOGFILE_PATH} | grep '\(FAILURE\|SUCCESS\).*|'
+    if ! cat ${TEST_LOGFILE_PATH} | grep '\(FAILURE\|SUCCESS\).*|' ; then
+        echo "No report found."
+    fi
     emph "--- End Test Report ---"
 }
 
@@ -65,9 +67,5 @@ on_exit() {
     fi
 }
 
-# Ensure that minikube cluster is cleaned (in case it is an existing cluster)
-emph "Cleaning up cluster..."
-retry cleanup
-
 # Ensure printing of report
 on_exit