Refactor e2e test

* Run sequentially after build and tests in CircleCI to reuse artifacts
* Support running it locally (both in Linux and Darwin systems)
  through `make e2e`. An existing Kubernetes cluster will be used if available,
  otherwise a cluster will be created with Kind.

.circleci/config.yml

@@ -2,9 +2,8 @@ version: 2
 jobs:
   build:
     working_directory: /go/src/github.com/weaveworks/flux
-    docker:
+    machine:
       - image: circleci/golang:1.10
-      - image: memcached
     steps:
       - checkout
       - setup_remote_docker
@@ -21,7 +20,7 @@ jobs:
       - run: make check-generated
       - run: make test TEST_FLAGS="-race -tags integration -timeout 60s"
       - run: make all
-
+      - run: make e2e
       - deploy:
           name: Maybe push prerelease images
           command: |
@@ -34,7 +33,6 @@ jobs:
               docker tag "docker.io/weaveworks/helm-operator:$(docker/image-tag)" "docker.io/weaveworks/helm-operator-prerelease:$(docker/image-tag)"
               docker push "docker.io/weaveworks/helm-operator-prerelease:$(docker/image-tag)"
             fi
-
       - deploy:
           name: Maybe push release image and upload binaries
           command: |
@@ -50,17 +48,6 @@ jobs:
               RELEASE_TAG=$(echo "$CIRCLE_TAG" | cut -c 6-)
               docker push "docker.io/weaveworks/helm-operator:${RELEASE_TAG}"
             fi
-  e2e-testing:
-    machine: true
-    working_directory: ~/go/src/github.com/weaveworks/flux
-    steps:
-      - checkout
-      - run: test/e2e/e2e-golang.sh
-      - run: test/e2e/e2e-flux-build.sh
-      - run: test/e2e/e2e-kind.sh
-      - run: test/e2e/e2e-helm.sh
-      - run: test/e2e/e2e-git.sh
-      - run: test/e2e/e2e-flux-chart.sh
 
 workflows:
   version: 2
@@ -70,6 +57,4 @@ workflows:
           filters:
             tags:
               only: /(helm-)?[0-9]+(\.[0-9]+)*(-[a-z]+)?/
-      - e2e-testing:
-          requires:
-            - build
+

.gitignore

@@ -40,3 +40,4 @@ docker/fluxy-dumbconf.priv
 test/profiles
 test/bin/kubectl
 test/bin/helm
+test/bin/kind

Makefile

@@ -47,14 +47,17 @@ release-bins:
 clean:
 	go clean
 	rm -rf ./build
-	rm -f test/bin/kubectl test/bin/helm
+	rm -f test/bin/kubectl test/bin/helm test/bin/kind
 
 realclean: clean
 	rm -rf ./cache
 
-test: test/bin/helm test/bin/kubectl
+test: test/bin/helm test/bin/kubectl build/.flux.done build/.helm-operator.done
 	PATH="${PWD}/bin:${PWD}/test/bin:${PATH}" go test ${TEST_FLAGS} $(shell go list ./... | grep -v "^github.com/weaveworks/flux/vendor" | sort -u)
 
+e2e: test/bin/helm test/bin/kubectl
+	PATH="${PWD}/test/bin:${PATH}" CURRENT_OS_ARCH=$(CURRENT_OS_ARCH) test/e2e/run.sh
+
 build/.%.done: docker/Dockerfile.%
 	mkdir -p ./build/docker/$*
 	cp $^ ./build/docker/$*/

test/e2e/git-dep.yaml → test/e2e/gitsrv.yaml

@@ -5,7 +5,6 @@ metadata:
   labels:
     name: gitsrv
   name: gitsrv
-  namespace: flux
 spec:
   replicas: 1
   selector:
@@ -46,7 +45,6 @@ metadata:
   labels:
     name: gitsrv
   name: gitsrv
-  namespace: flux
 spec:
   ports:
     - name: ssh