From 28a13db29aa2db1dadcaa8befd65658cd668b93c Mon Sep 17 00:00:00 2001
From: wangyan <wangyan@vmware.com>
Date: Tue, 3 Jul 2018 08:42:26 -0700
Subject: [PATCH] Fix CI pipeline bug on packaging offline installer

---
 tests/integration.sh       | 3 +--
 tests/resources/Util.robot | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/integration.sh b/tests/integration.sh
index 2bee3680e..99aa77972 100755
--- a/tests/integration.sh
+++ b/tests/integration.sh
@@ -181,6 +181,7 @@ fi
 #                                     latest.build
 #                                     harbor-offline-installer-latest.tgz
 #
+set -e
 if [ $upload_build == true ] && [ $rc -eq 0 ]; then
     cp $harbor_build_bundle harbor-offline-installer-latest.tgz
     uploader $harbor_build_bundle $harbor_target_bucket
@@ -207,5 +208,3 @@ fi
 if [ -f "$keyfile" ]; then
   rm -f $keyfile
 fi
-
-exit $rc
\ No newline at end of file
diff --git a/tests/resources/Util.robot b/tests/resources/Util.robot
index 989f838be..181de5734 100644
--- a/tests/resources/Util.robot
+++ b/tests/resources/Util.robot
@@ -21,7 +21,6 @@ Library  Process
 Library  SSHLibrary  1 minute
 Library  DateTime
 Library  Selenium2Library  10  10
-Library  JSONLibrary
 Resource  Nimbus-Util.robot
 Resource  Vsphere-Util.robot
 Resource  VCH-Util.robot
@@ -36,6 +35,7 @@ Resource  Harbor-Pages/Project-Members.robot
 Resource  Harbor-Pages/Project-Members_Elements.robot
 Resource  Harbor-Pages/Project-Repository.robot
 Resource  Harbor-Pages/Project-Repository_Elements.robot
+Resource  Harbor-Pages/Project-Config.robot
 Resource  Harbor-Pages/Replication.robot
 Resource  Harbor-Pages/Replication_Elements.robot
 Resource  Harbor-Pages/UserProfile.robot
@@ -51,6 +51,4 @@ Resource  Admiral-Util.robot
 Resource  OVA-Util.robot
 Resource  Cert-Util.robot
 Resource  SeleniumUtil.robot
-Resource  Harbor-Pages/Project-Config.robot
 Resource  Nightly-Util.robot
-Resource  Harbor-Pages/Verify.robot