From d86692d61c9542882ff145d541c71364861c7251 Mon Sep 17 00:00:00 2001
From: wang yan <wangyan@vmware.com>
Date: Wed, 10 Oct 2018 17:18:10 +0800
Subject: [PATCH] Add step to upload travis logs into GCR

Signed-off-by: wang yan <wangyan@vmware.com>
---
 .travis.yml             |  2 --
 tests/travis/api_run.sh | 42 ++++++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 409f114d9..63c5a81e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,8 +44,6 @@ apt:
   - google-chrome-stable
   - google-chrome-beta
 before_install:
-#- openssl aes-256-cbc -K $encrypted_ed2284a9ecc3_key -iv $encrypted_ed2284a9ecc3_iv
-#  -in gskey.sh.enc -out ./gskey.sh -d
 - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname
   -s`-`uname -m` > docker-compose
 - chmod +x docker-compose
diff --git a/tests/travis/api_run.sh b/tests/travis/api_run.sh
index 32eccb4fc..627842676 100644
--- a/tests/travis/api_run.sh
+++ b/tests/travis/api_run.sh
@@ -2,9 +2,9 @@
 
 #source gskey.sh
 
-#sudo gsutil version -l
+sudo gsutil version -l
 
-#harbor_logs_bucket="harbor-ci-logs"
+harbor_logs_bucket="harbor-ci-logs"
 # GC credentials
 #keyfile="/home/travis/harbor-ci-logs.key"
 #botofile="/home/travis/.boto"
@@ -18,12 +18,12 @@
 #echo "default_project_id = $GS_PROJECT_ID" >> $botofile
 
 # GS util
-#function uploader {
-#    sudo gsutil cp $1 gs://$2/$1
-#    sudo gsutil -D setacl public-read gs://$2/$1 &> /dev/null
-#}
+function uploader {
+   sudo gsutil cp $1 gs://$2/$1
+   sudo gsutil acl ch -u AllUsers:R gs://$2/$1 &> /dev/null
+}
 
-#set +e
+set +e
 
 docker ps
 # run db auth api cases
@@ -35,16 +35,20 @@ if [ "$1" = 'LDAP' ]; then
     pybot -v ip:$2 -v HARBOR_PASSWORD:Harbor12345 /home/travis/gopath/src/github.com/goharbor/harbor/tests/robot-cases/Group0-BAT/API_LDAP.robot
 fi
 
-## --------------------------------------------- Upload Harbor CI Logs -------------------------------------------
-#outfile="integration_logs_$TRAVIS_BUILD_NUMBER_$TRAVIS_COMMIT.tar.gz"
-#sudo tar -zcvf $outfile output.xml log.html /var/log/harbor/*
-#if [ -f "$outfile" ]; then
-#    uploader $outfile $harbor_logs_bucket
-#    echo "----------------------------------------------"
-#    echo "Download test logs:"
-#    echo "https://storage.googleapis.com/harbor-ci-logs/$outfile"
-#    echo "----------------------------------------------"
-#else
-#    echo "No log output file to upload"
-#fi
+rc=$?
+echo $rc
 
+## --------------------------------------------- Upload Harbor CI Logs -------------------------------------------
+outfile="integration_logs_$TRAVIS_BUILD_NUMBER_$TRAVIS_COMMIT.tar.gz"
+sudo tar -zcvf $outfile output.xml log.html /var/log/harbor/*
+if [ -f "$outfile" ]; then
+   uploader $outfile $harbor_logs_bucket
+   echo "----------------------------------------------"
+   echo "Download test logs:"
+   echo "https://storage.googleapis.com/harbor-ci-logs/$outfile"
+   echo "----------------------------------------------"
+else
+   echo "No log output file to upload"
+fi
+
+exit $rc
\ No newline at end of file