From 5bded8e6a1bf07204049051336b9f51f739534fa Mon Sep 17 00:00:00 2001
From: Daniel Jiang <jiangd@vmware.com>
Date: Mon, 3 Sep 2018 18:37:51 +0800
Subject: [PATCH] Bump up clair to v2.0.5 (#5787)

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
---
 Makefile             | 2 +-
 make/photon/Makefile | 2 +-
 tests/integration.sh | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 2dd39530a..591851ca5 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ NGINXVERSION=$(VERSIONTAG)
 PHOTONVERSION=1.0
 NOTARYVERSION=v0.5.1
 MARIADBVERSION=$(VERSIONTAG)
-CLAIRVERSION=v2.0.4
+CLAIRVERSION=v2.0.5
 CLAIRDBVERSION=$(VERSIONTAG)
 MIGRATORVERSION=v1.5.0
 REDISVERSION=$(VERSIONTAG)
diff --git a/make/photon/Makefile b/make/photon/Makefile
index ecb51f157..e6d722757 100644
--- a/make/photon/Makefile
+++ b/make/photon/Makefile
@@ -121,7 +121,7 @@ _build_clair:
 	@if [ "$(CLAIRFLAG)" = "true" ] ; then \
 		if [ "$(BUILDBIN)" != "true" ] ; then \
 			rm -rf $(DOCKERFILEPATH_CLAIR)/binary && mkdir -p $(DOCKERFILEPATH_CLAIR)/binary && \
-			$(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/clair, $(DOCKERFILEPATH_CLAIR)/binary/clair); \
+			$(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/clair/release2.0-$(CLAIRVERSION)/clair, $(DOCKERFILEPATH_CLAIR)/binary/clair); \
 		else \
 			cd $(DOCKERFILEPATH_CLAIR) && $(DOCKERFILEPATH_CLAIR)/builder $(CLAIRVERSION); \
 		fi ; \
diff --git a/tests/integration.sh b/tests/integration.sh
index 2bee3680e..af29923b3 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
@@ -70,7 +70,7 @@ container_ip=`ip addr s eth0 |grep "inet "|awk '{print $2}' |awk -F "/" '{print
 echo $container_ip
 
 ## --------------------------------------------- Init Version -----------------------------------------------
-buildinfo=$(drone build info vmware/harbor $DRONE_BUILD_NUMBER)
+buildinfo=$(drone build info goharbor/harbor $DRONE_BUILD_NUMBER)
 echo $buildinfo
 git_commit=$(git rev-parse --short=8 HEAD)
 
@@ -208,4 +208,4 @@ if [ -f "$keyfile" ]; then
   rm -f $keyfile
 fi
 
-exit $rc
\ No newline at end of file
+exit $rc