Attempt to fix build failure in forked PRs (#154)

* only push image if quay.io credentials are present

* fix command to be multi-line string

* flip backward test

* Add comment so circle will see the previous change

* only run gcp integration tests if secret key is available

* fix typo in config file

* Update rhel test to check for secret_key

Co-authored-by: Jerry Jackson <jerry@weave.works>
Co-authored-by: Mark Emeis <mark.emeis@weave.works>

.circleci/config.yml

@@ -60,9 +60,14 @@ jobs:
           - kubectl
           - cmd/wksctl/wksctl
           - cmd/mock-https-authz-server/server
-      - run: docker login -u "$QUAY_IO_USER" -p "$QUAY_IO_PASSWORD" quay.io
-      - run: make push
-
+      - run:
+          # Allow builds from forks
+          name: Push image if quay login is available
+          command: |
+            if [ -n "$QUAY_IO_USER" -a -n "$QUAY_IO_PASSWORD" ]; then
+              docker login -u "$QUAY_IO_USER" -p "$QUAY_IO_PASSWORD" quay.io
+              make push
+            fi
   unit-tests:
     docker:
       - image: quay.io/wks/build:master-134af34f
@@ -208,19 +213,14 @@ jobs:
             echo "$KUBECTL_CHECKSUM kubectl.tar.gz" | sha256sum -c
             tar xvzf kubectl.tar.gz --strip-components=3
             sudo mv kubectl /usr/local/bin
-
       - run:
-          name: Create VMs
-          command: $SRCDIR/test/integration/bin/up.sh
-
-      - run:
-          name: Run integration tests
-          command: $SRCDIR/test/integration/bin/test.sh
-
-      - run:
-          name: Destroy VMs
-          command: $SRCDIR/test/integration/bin/down.sh
-          when: always
+          name: Centos integration tests
+          command: |
+            if [ -n "$SECRET_KEY" ]; then
+              $SRCDIR/test/integration/bin/up.sh
+              $SRCDIR/test/integration/bin/test.sh
+              $SRCDIR/test/integration/bin/down.sh
+            fi
       - run: "true"
   integration-tests-gcp-ubuntu:
     docker:
@@ -250,17 +250,13 @@ jobs:
             sudo mv kubectl /usr/local/bin
 
       - run:
-          name: Create VMs
-          command: $SRCDIR/test/integration/bin/up.sh
-
-      - run:
-          name: Run integration tests
-          command: $SRCDIR/test/integration/bin/test.sh
-
-      - run:
-          name: Destroy VMs
-          command: $SRCDIR/test/integration/bin/down.sh
-          when: always
+          name: Ubuntu integration tests
+          command: |
+            if [ -n "$SECRET_KEY" ]; then
+              $SRCDIR/test/integration/bin/up.sh
+              $SRCDIR/test/integration/bin/test.sh
+              $SRCDIR/test/integration/bin/down.sh
+            fi
       - run: "true"
   integration-tests-gcp-rhel:
     docker:
@@ -290,15 +286,12 @@ jobs:
             sudo mv kubectl /usr/local/bin
 
       - run:
-          name: Create VMs
-          command: $SRCDIR/test/integration/bin/up.sh
-
-      - run:
-          name: Run integration tests
-          command: $SRCDIR/test/integration/bin/test.sh
+          name: rhel integration tests
+          command: |
+            if [ -n "$SECRET_KEY" ]; then
+              $SRCDIR/test/integration/bin/up.sh
+              $SRCDIR/test/integration/bin/test.sh
+              $SRCDIR/test/integration/bin/down.sh
+            fi
 
-      - run:
-          name: Destroy VMs
-          command: $SRCDIR/test/integration/bin/down.sh
-          when: always
       - run: "true"