CircleCI: Build and push load tester

fluxcd · Jun 22, 2019 · 0d4d2ac · 0d4d2ac
1 parent d059191
commit 0d4d2ac
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -53,7 +53,6 @@ jobs:
           at: /tmp/bin
       - run: test/container-build.sh
       - run: test/container-push.sh
-      - run: make loadtester-push
 
   push-binary:
     docker:

diff --git a/test/README.md b/test/README.md
@@ -11,9 +11,8 @@ The e2e testing infrastructure is powered by CircleCI and [Kubernetes Kind](http
 * deploy Tiller on the local cluster [e2e-istio.sh](e2e-istio.sh)
 * install Istio CRDs with Helm [e2e-istio.sh](e2e-istio.sh)
 * install Istio control plane and Prometheus with Helm [e2e-istio.sh](e2e-istio.sh)
-* build Flagger container image [e2e-istio-build.sh](e2e-istio-build.sh)
-* load Flagger image onto the local cluster [e2e-istio-build.sh.sh](e2e-istio-build.sh)
-* deploy Flagger in the istio-system namespace [e2e-istio-build.sh.sh](e2e-istio-build.sh)
+* load Flagger image onto the local cluster [e2e-istio.sh](e2e-istio.sh)
+* deploy Flagger in the istio-system namespace [e2e-istio.sh](e2e-istio.sh)
 * create a test namespace with Istio injection enabled [e2e-tests.sh](e2e-tests.sh)
 * deploy the load tester in the test namespace [e2e-tests.sh](e2e-tests.sh)
 * deploy a demo workload (podinfo) in the test namespace [e2e-tests.sh](e2e-tests.sh)
@@ -29,9 +28,8 @@ The e2e testing infrastructure is powered by CircleCI and [Kubernetes Kind](http
 * install latest stable Helm CLI [e2e-nginx.sh](e2e-istio.sh)
 * deploy Tiller on the local cluster [e2e-nginx.sh](e2e-istio.sh)
 * install NGINX ingress with Helm [e2e-nginx.sh](e2e-istio.sh)
-* build Flagger container image [e2e-nginx-build.sh](e2e-build.sh)
-* load Flagger image onto the local cluster [e2e-nginx-build.sh](e2e-build.sh)
-* install Flagger and Prometheus in the ingress-nginx namespace [e2e-nginx-build.sh](e2e-build.sh)
+* load Flagger image onto the local cluster [e2e-nginx.sh](e2e-nginx.sh)
+* install Flagger and Prometheus in the ingress-nginx namespace [e2e-nginx.sh](e2e-nginx.sh)
 * create a test namespace [e2e-nginx-tests.sh](e2e-tests.sh)
 * deploy the load tester in the test namespace [e2e-nginx-tests.sh](e2e-tests.sh)
 * deploy the demo workload (podinfo) and ingress in the test namespace [e2e-nginx-tests.sh](e2e-tests.sh)

diff --git a/test/container-build.sh b/test/container-build.sh
@@ -9,3 +9,4 @@ cp /tmp/bin/flagger ${REPO_ROOT}/bin && chmod +x ${REPO_ROOT}/bin/flagger
 cp /tmp/bin/loadtester ${REPO_ROOT}/bin && chmod +x ${REPO_ROOT}/bin/loadtester
 
 docker build -t test/flagger:latest . -f ${REPO_ROOT}/Dockerfile
+docker build -t test/flagger-loadtester:latest . -f ${REPO_ROOT}/Dockerfile.loadtester
diff --git a/test/container-push.sh b/test/container-push.sh
@@ -17,5 +17,7 @@ if [[ -z "$CIRCLE_TAG" ]]; then
 else
     echo $DOCKER_PASS | docker login -u=$DOCKER_USER --password-stdin;
     docker tag test/flagger:latest weaveworks/flagger:${CIRCLE_TAG};
+    docker tag test/flagger-loadtester:latest weaveworks/flagger-loadtester:${CIRCLE_TAG};
     docker push weaveworks/flagger:${CIRCLE_TAG};
+    docker push weaveworks/flagger-loadtester:${CIRCLE_TAG};
 fi
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,4 @@ cp /tmp/bin/flagger ${REPO_ROOT}/bin && chmod +x ${REPO_ROOT}/bin/flagger
		cp /tmp/bin/loadtester ${REPO_ROOT}/bin && chmod +x ${REPO_ROOT}/bin/loadtester

		docker build -t test/flagger:latest . -f ${REPO_ROOT}/Dockerfile
		docker build -t test/flagger-loadtester:latest . -f ${REPO_ROOT}/Dockerfile.loadtester