[integration-test] support test PR

Author: Jimmy-Xu

Dockerfile.qa

@@ -28,6 +28,7 @@ ENV DOCKER_CERT_PATH=fixtures/hyper_ssl
 ENV DOCKER_TLS_VERIFY=
 
 ENV DOCKER_HOST="tcp://us-west-1.hyper.sh:443"
+## if BRANCH start with '#', then it means PR number, otherwise it means branch name
 ENV BRANCH="master"
 
 ENV ACCESS_KEY=

hack/generate-hyper-conf-qa.sh

@@ -1,11 +1,22 @@
 #!/bin/bash
 
+env
+
 # set default value of DOCKER_HOST and BRANCH
 if [[ "$DOCKER_HOST" == "" ]];then
   DOCKER_HOST="tcp://us-west-1.hyper.sh:443"
 fi
-if [[ "$BRANCH" == "" ]];then
-  BRANCH="master"
+
+PR=""
+if [[ "${BRANCH:0:1}" == "#" ]];then
+  PR=${BRANCH:1}
+  BRANCH=""
+  echo "========== Task: test PR #${PR} =========="
+else
+  if [[ "${BRANCH}" == "" ]];then
+    BRANCH="master"
+  fi
+  echo "========== Task: test BRANCH ${BRANCH} =========="
 fi
 
 
@@ -23,8 +34,6 @@ if [[ "$@" != "./build.sh" ]];then
 }
 EOF
 
-env
-
 echo "========== config git proxy =========="
 if [ "${http_proxy}" != "" ];then
   git config --global http.proxy ${http_proxy}
@@ -34,16 +43,27 @@ if [ "${https_proxy}" != "" ];then
 fi
 git config --list | grep proxy
 
+echo "========== ping github.com =========="
+ping -c 6 -W 10 github.com
+
 echo "========== Clone hypercli repo =========="
 mkdir -p /go/src/github.com/{hyperhq,docker}
 cd /go/src/github.com/hyperhq
 git clone https://github.com/hyperhq/hypercli.git
 
 echo "========== Build hypercli =========="
 cd /go/src/github.com/hyperhq/hypercli
-git checkout $BRANCH
+if [[ "${BRANCH}" != "" ]];then
+  echo "checkout branch :${BRANCH}"
+  git checkout ${BRANCH}
+elif [[ "${PR}" != "" ]];then
+  echo "checkout pr :#$PR"
+  git fetch origin pull/${PR}/head:pr-${PR}
+  git checkout pr-${PR}
+fi
+
 if [[ $? -ne 0 ]];then
-  echo "Branch $BRANCH not exist!"
+  echo "Branch ${BRANCH} not exist!"
   exit 1
 fi
 ./build.sh
@@ -67,6 +87,7 @@ fi
 
 #execute command
 if [[ $# -ne 0 ]];then
+    echo "========== Test Cmd: $@ =========="
     cd /go/src/github.com/hyperhq/hypercli/integration-cli && eval $@
     if [[ "$@" == "./build.sh" ]];then
     #show make result

integration-cli/README.md

@@ -322,6 +322,9 @@ $ ./util.sh qa
 
 //test integration-test branch
 $ ./util.sh qa integration-test
+
+//test PR
+$ ./util.sh qa "#222"
 ```
 
 #### run test via docker cli
@@ -337,14 +340,24 @@ $ docker run -it --rm \
     -e SECRET_KEY=${SECRET_KEY} \
     hyperhq/hypercli-auto-test:qa go test -check.f TestCli -timeout 180m
 
+
+//test `specified PR`
+$ docker run -it --rm \
+    -e ACCESS_KEY=${ACCESS_KEY} \
+    -e SECRET_KEY=${SECRET_KEY} \
+		-e BRANCH="#221" \
+    hyperhq/hypercli-auto-test:qa go test -check.f TestCli -timeout 180m
+
+
 //test `specified branch` with `packet` apirouter
 $ docker run -it --rm \
     -e ACCESS_KEY=${ACCESS_KEY} \
     -e SECRET_KEY=${SECRET_KEY} \
     -e BRANCH=integration-test \
-    -e DOCKER_HOST=tcp://147.75.195.39:6443 \
+    -e DOCKER_HOST=tcp://147.75.x.x:6443 \
     hyperhq/hypercli-auto-test:qa go test -check.f TestCli -timeout 180m
 
+
 //test with http proxy
 $ docker run -it --rm \
     -e ACCESS_KEY=${ACCESS_KEY} \

integration-cli/util.conf.template

@@ -7,7 +7,7 @@ export DOCKER_REMOTE_DAEMON=1
 #########################################
 #packet env
 #########################################
-#export HYPER_HOST="tcp://147.75.195.39:6443"     #packet
+#export HYPER_HOST="tcp://147.75.x.x:6443"     #packet
 export HYPER_HOST="tcp://us-west-1.hyper.sh:443"  #zenlayer
 
 #Hyper Credentials