From 91ea6ccd0ff20a5d3285cc6ca010746c4a23872b Mon Sep 17 00:00:00 2001
From: Zach Shepherd <shepherdz@vmware.com>
Date: Wed, 8 Aug 2018 18:07:37 -0700
Subject: [PATCH 1/2] Fix syntax error in check-org-membership

Currently, check-org-membership results in a bash syntax error, which
seems to be preventing CI from running.
---
 .drone.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 4772661bb..d31ee78bd 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -22,7 +22,7 @@ pipeline:
     commands:
       - echo ${DRONE_COMMIT_AUTHOR}
       - echo $SKIP_CHECK_MEMBERSHIP
-      - if $SKIP_CHECK_MEMBERSHIP == true; then echo 'check-org-membership step skipped'; else /bin/bash -c '[[ ! $(curl --silent "https://api.github.com/orgs/vmware/members/${DRONE_COMMIT_AUTHOR}?access_token=$GITHUB_AUTOMATION_API_KEY") ]]'; fi
+      - if [ "$SKIP_CHECK_MEMBERSHIP" = "true" ]; then echo 'check-org-membership step skipped'; else /bin/bash -c '[[ ! $(curl --silent "https://api.github.com/orgs/vmware/members/${DRONE_COMMIT_AUTHOR}?access_token=$GITHUB_AUTOMATION_API_KEY") ]]'; fi
     when:
       status: success
 
@@ -86,4 +86,4 @@ pipeline:
       repo: vmware/harbor
       event: [ push, tag ]
       branch: [ master, release-*, refs/tags/* ]
-      status: success
\ No newline at end of file
+      status: success

From f387da0a9d478c64f200ea0025614c8b7923fe68 Mon Sep 17 00:00:00 2001
From: Zach Shepherd <shepherdz@vmware.com>
Date: Wed, 8 Aug 2018 18:18:36 -0700
Subject: [PATCH 2/2] Refer to goharbor/harbor in the integration logic

An incomplete update to the integration testing logic to replace some
instances of vmware/harbor with goharbor/harbor to get CI working.
---
 .drone.yml           | 6 +++---
 tests/integration.sh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index d31ee78bd..3b3881357 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -67,9 +67,9 @@ pipeline:
         target: slack_webhook
     username: drone
     template: >
-      build https://ci-vic.vmware.com/vmware/harbor/{{ build.number }} finished with a {{ build.status }} status. Please find logs at https://storage.googleapis.com/harbor-ci-logs/integration_logs_{{ build.number }}_{{ build.commit }}.tar.gz
+      build https://ci-vic.vmware.com/goharbor/harbor/{{ build.number }} finished with a {{ build.status }} status. Please find logs at https://storage.googleapis.com/harbor-ci-logs/integration_logs_{{ build.number }}_{{ build.commit }}.tar.gz
     when:
-      repo: vmware/harbor
+      repo: goharbor/harbor
       event: [push, tag, deployment]
       branch: [ master, release-*, refs/tags/* ]
       status: [ failure, success ]
@@ -83,7 +83,7 @@ pipeline:
     repositories:
        - vmware/vic-product
     when:
-      repo: vmware/harbor
+      repo: goharbor/harbor
       event: [ push, tag ]
       branch: [ master, release-*, refs/tags/* ]
       status: success
diff --git a/tests/integration.sh b/tests/integration.sh
index c35af9247..ab2a37598 100755
--- a/tests/integration.sh
+++ b/tests/integration.sh
@@ -18,7 +18,7 @@ gsutil version -l
 set +x
 
 ## -------------------------------------------- Pre-condition --------------------------------------------
-if [[ $DRONE_REPO != "vmware/harbor" ]]; then
+if [[ $DRONE_REPO != "goharbor/harbor" ]]; then
     echo "Only run tests again Harbor Repo."
     exit 1
 fi
@@ -226,4 +226,4 @@ if [ -f "$keyfile" ]; then
   rm -f $keyfile
 fi
 
-exit $rc
\ No newline at end of file
+exit $rc