Merge branch 'release/v0.5.0'

moooofly · Jun 22, 2018 · d473c2c · d473c2c
2 parents 00f1611 + 8fe24a0
commit d473c2c
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 9 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.0
+v0.5.0
diff --git a/binPack.sh b/binPack.sh
diff --git a/scripts/binPack.sh b/scripts/binPack.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+echo "----- build harbor-go-client for packaging -----"
+go build -v ../
+echo "------------------------------------------------"
+echo
+
+VER=$(cat ../VERSION)
+
+echo "===> Packaging ${VER}-bin.tar.gz"
+echo
+tar czvf ${VER}-bin.tar.gz harbor-go-client config.yaml rp.yaml
+echo
+echo "===> Packaging complete."
+echo
+
+echo "----- remove harbor-go-client -----"
+rm harbor-go-client
diff --git a/config.yaml → scripts/config.yaml b/config.yaml → scripts/config.yaml
diff --git a/test.sh → scripts/regression_test.sh b/test.sh → scripts/regression_test.sh
@@ -8,6 +8,10 @@ ERROR="\033[41;30;1m Error \033[0m"
 
 prepare() {
 
+    echo "----- build harbor-go-client for tesing -----"
+    go build -v ../
+    echo "-----------------\n\n"
+
     echo "----- docker login -----"
     docker login --username admin --password Harbor12345 $HARBOR_ADDR
     echo
@@ -53,6 +57,10 @@ cleanup() {
     echo "----- docker logout -----"
     docker logout $HARBOR_ADDR
     echo "-----------------\n\n"
+
+    echo "----- remove harbor-go-client -----"
+    rm harbor-go-client
+    echo "-----------------\n\n"
 }
 
 full_api_tests() {
@@ -337,6 +345,10 @@ projects_test() {
 
 users_test() {
 
+    echo "----- build harbor-go-client for tesing -----"
+    go build -v ../
+    echo "-----------------\n\n"
+
     echo "----- harbor-go-client login -----"
     ./harbor-go-client login -u admin -p Harbor12345 && echo "${SUCCESS} username: admin\n${SUCCESS} Save .cookie.yaml" || echo "${ERROR}"
     echo "-----------------\n\n"
@@ -348,6 +360,10 @@ users_test() {
     echo "----- logout -----"
     ./harbor-go-client logout && echo "${SUCCESS} Delete .cookie.yaml" || echo "${ERROR}"
     echo "-----------------\n\n"
+
+    echo "----- remove harbor-go-client -----"
+    rm harbor-go-client
+    echo "-----------------\n\n"
 }
 
 retention_policy_test() {
@@ -358,7 +374,7 @@ retention_policy_test() {
     echo "===================================="
     echo
 
-    ./rp_repos.sh 10 10 10
+    ./rp_repos_simulation.sh 10 10 10
     echo "-----------------\n\n"
 }
 

diff --git a/rp.yaml → scripts/rp.yaml b/rp.yaml → scripts/rp.yaml
diff --git a/rp_repos.sh → scripts/rp_repos_simulation.sh b/rp_repos.sh → scripts/rp_repos_simulation.sh
@@ -111,6 +111,13 @@ doLogin() {
     echo
     echo -e "$L1 --> login $END"
     echo
+
+    echo "----- build harbor-go-client for tesing -----"
+    go build -v ../
+    echo "-----------------"
+    echo
+    echo
+
     ./harbor-go-client login -u admin -p Harbor12345
     echo
 
@@ -130,6 +137,12 @@ doLogout() {
     echo "----- docker logout -----"
     docker logout $HARBOR_ADDR
     echo
+
+    echo "----- remove harbor-go-client -----"
+    rm harbor-go-client
+    echo "-----------------"
+    echo
+    echo
 }