From 4690be861826d1cd7e59f6dc2645b2f51e19657a Mon Sep 17 00:00:00 2001
From: jpellizzari <jordan@weave.works>
Date: Mon, 13 Feb 2017 11:35:01 -0800
Subject: [PATCH] test

---
 circle.yml | 65 +++++++++++++-----------------------------------------
 1 file changed, 15 insertions(+), 50 deletions(-)

diff --git a/circle.yml b/circle.yml
index 886e8ae9b..1d0158764 100644
--- a/circle.yml
+++ b/circle.yml
@@ -14,7 +14,6 @@ machine:
     PATH: $PATH:$HOME/.local/bin
     CLOUDSDK_CORE_DISABLE_PROMPTS: 1
     SCOPE_UI_BUILD: $HOME/docker/scope_ui_build.tar
-    IMAGES: scope cloud-agent
 
 dependencies:
   pre:
@@ -40,37 +39,8 @@ dependencies:
 
 test:
   override:
-<<<<<<< HEAD
     - cd $SRCDIR; make RM= lint:
         parallel: true
-    - cd $SRCDIR; COVERDIR=./coverage make RM= CODECGEN_UID=23 tests:
-        parallel: true
-    - cd $SRCDIR; make RM= client-test static:
-        parallel: true
-    - cd $SRCDIR; make RM= client-lint static:
-        parallel: true
-    - cd $SRCDIR; rm -f prog/scope; if [ "$CIRCLE_NODE_INDEX" = "0" ]; then GOARCH=arm make GO_BUILD_INSTALL_DEPS= RM= prog/scope; else GOOS=darwin make GO_BUILD_INSTALL_DEPS= RM= prog/scope; fi:
-        parallel: true
-    - cd $SRCDIR; rm -f prog/scope; make RM=:
-        parallel: true
-    - cd $SRCDIR/extras; ./build_on_circle.sh:
-        parallel: true
-    - "test -z \"$SECRET_PASSWORD\" || (cd $SRCDIR/integration; ./gce.sh setup && eval $(./gce.sh hosts); ./setup.sh)":
-        parallel: true
-    - test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; eval $(./gce.sh hosts); ./run_all.sh):
-        parallel: true
-        timeout: 300
-  post:
-    - test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; ./gce.sh destroy):
-        parallel: true
-    - test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR; ./tools/cover/gather_coverage.sh ./coverage $SRCDIR/coverage):
-        parallel: true
-    - test "$CIRCLE_NODE_INDEX" != "0" || (goveralls -repotoken $COVERALLS_REPO_TOKEN -coverprofile=$SRCDIR/profile.cov -service=circleci || true):
-        parallel: true
-    - test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR; cp scope.tar $CIRCLE_ARTIFACTS):
-=======
-    # - cd $SRCDIR; make RM= lint:
-    #     parallel: true
     # - cd $SRCDIR; COVERDIR=./coverage make RM= tests:
     #     parallel: true
     # - cd $SRCDIR; make RM= client-test static:
@@ -88,16 +58,15 @@ test:
     # - test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; eval $(./gce.sh hosts); ./run_all.sh):
     #     parallel: true
     #     timeout: 300
-  post:
-    # - test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; ./gce.sh destroy):
-    #     parallel: true
-    # - test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR; ./tools/cover/gather_coverage.sh ./coverage $SRCDIR/coverage):
-    #     parallel: true
-    # - test "$CIRCLE_NODE_INDEX" != "0" || (goveralls -repotoken $COVERALLS_REPO_TOKEN -coverprofile=$SRCDIR/profile.cov -service=circleci || true):
-    #     parallel: true
-    # - test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR; cp coverage.* scope.tar $CIRCLE_ARTIFACTS):
->>>>>>> ci fix
-        parallel: true
+  # post:
+  #   - test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; ./gce.sh destroy):
+  #       parallel: true
+  #   - test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR; ./tools/cover/gather_coverage.sh ./coverage $SRCDIR/coverage):
+  #       parallel: true
+  #   - test "$CIRCLE_NODE_INDEX" != "0" || (goveralls -repotoken $COVERALLS_REPO_TOKEN -coverprofile=$SRCDIR/profile.cov -service=circleci || true):
+  #       parallel: true
+  #   - test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR; cp coverage.* scope.tar $CIRCLE_ARTIFACTS):
+  #       parallel: true
 
 deployment:
   hub:
@@ -106,17 +75,13 @@ deployment:
       - |
         test -z "${DOCKER_USER}" || (
           docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS &&
-          (test "${DOCKER_ORGANIZATION:-$DOCKER_USER}" != "weaveworks" && (
-            for IMAGE in $IMAGES; do
-              docker tag weaveworks/$IMAGE:latest ${DOCKER_ORGANIZATION:-$DOCKER_USER}/$IMAGE:latest &&
-              docker tag weaveworks/$IMAGE:$(./tools/image-tag) ${DOCKER_ORGANIZATION:-$DOCKER_USER}/$IMAGE:$(./tools/image-tag)
-            done
+          (test "${DOCKER_ORGANIZATION:-$DOCKER_USER}" == "weaveworks" || (
+            docker tag weaveworks/scope:latest ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:latest &&
+            docker tag weaveworks/scope:$(./tools/image-tag) ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:$(./tools/image-tag)
           )) &&
-          for IMAGE in $IMAGES; do
-            docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/$IMAGE &&
-            docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/$IMAGE:$(./tools/image-tag)
-          done
-          (test -z "${UI_BUCKET_KEY_ID}" || (cd $SRCDIR && make ui-upload && make ui-pkg-upload))
+          docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope &&
+          docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:$(./tools/image-tag) &&
+          (test -z "${UI_BUCKET_KEY_ID}" || (cd $SRCDIR && make ui-upload))
         )
       - |
         test -z "${QUAY_USER}" || (