Merge pull request #45 from csi-driver/refator-test-infra

test: refactor test infra

Author: andyzhangx

.travis.yml

@@ -7,17 +7,28 @@ env:
     - GO111MODULE=off
 
 go:
-  - "1.11.4"
+  - "1.12.1"
 
-before_install:
-  - go get github.com/mattn/goveralls
-  - go get github.com/rexray/gocsi/csc
-  - go get github.com/golang/dep/cmd/dep
-
-script:
-  - hack/verify-all.sh
-  - go test -covermode=count -coverprofile=profile.cov ./pkg/...
-  - make blobfuse
-  - make sanity-test
-  - make integration-test
-  - make blobfuse-windows
+jobs:
+  include:
+    - stage: test
+      name: "build test"
+      install:
+        - GO111MODULE=off go get github.com/mattn/goveralls
+        - go get github.com/golang/dep/cmd/dep
+      script:
+        - hack/verify-all.sh
+        - make blobfuse
+        - make blobfuse-windows
+        - go test -covermode=count -coverprofile=profile.cov ./pkg/...
+    - stage: test
+      name: "sanity Test"
+      script: make sanity-test
+      after_failure: TRAVIS_TEST_RESULT=0
+    - stage: test
+      name: "integration Test"
+      install:
+        - GO111MODULE=off go get github.com/rexray/gocsi/csc
+      script:
+        - make blobfuse
+        - make integration-test

Makefile

@@ -30,7 +30,7 @@ test:
 	go test -covermode=count -coverprofile=profile.cov ./pkg/...
 	$GOPATH/bin/goveralls -coverprofile=profile.cov -service=travis-ci
 integration-test:
-	sudo test/integration/run-tests-all-clouds.sh
+	test/integration/run-tests-all-clouds.sh
 sanity-test:
 	test/sanity/run-tests-all-clouds.sh
 blobfuse:

test/integration/run-test.sh

@@ -17,7 +17,11 @@
 
 set -euo pipefail
 
-csc=$GOPATH/bin/csc
+csc="csc"
+if [ -v GOPATH ]; then
+        csc=$GOPATH/bin/csc
+fi
+
 volname=`date +%s`
 volname="citest-$volname"
 volSize="2147483648"

test/integration/run-tests-all-clouds.sh

@@ -16,11 +16,18 @@
 
 set -euo pipefail
 
-export set AZURE_CREDENTIAL_FILE=/tmp/azure.json
+if [ ! -v AZURE_CREDENTIAL_FILE ]; then
+        export set AZURE_CREDENTIAL_FILE=/tmp/azure.json
+fi
 
 # run test on AzurePublicCloud
-cp test/integration/azure.json $AZURE_CREDENTIAL_FILE
 if [ -v aadClientSecret ]; then
+	cp test/integration/azure.json $AZURE_CREDENTIAL_FILE
+
+        # copy blobfuse binary
+        sudo mkdir /usr/blob
+        sudo cp test/sanity/blobfuse /usr/blob/blobfuse
+
 	sed -i "s/tenantId-input/$tenantId/g" $AZURE_CREDENTIAL_FILE
 	sed -i "s/subscriptionId-input/$subscriptionId/g" $AZURE_CREDENTIAL_FILE
 	sed -i "s/aadClientId-input/$aadClientId/g" $AZURE_CREDENTIAL_FILE
@@ -29,7 +36,7 @@ if [ -v aadClientSecret ]; then
 	sed -i "s/location-input/$location/g" $AZURE_CREDENTIAL_FILE
 fi
 
-test/integration/run-test.sh "tcp://127.0.0.1:10000" "/tmp/testmount1" "AzurePublicCloud"
+sudo test/integration/run-test.sh "tcp://127.0.0.1:10000" "/tmp/testmount1" "AzurePublicCloud"
 
 # run test on AzureChinaCloud
 if [ -v aadClientSecret_china ]; then
@@ -43,5 +50,5 @@ if [ -v aadClientSecret_china ]; then
 	sed -i "s/resourceGroup-input/${resourceGroup_china}/g" $AZURE_CREDENTIAL_FILE
 	sed -i "s/location-input/${location_china}/g" $AZURE_CREDENTIAL_FILE
 
-	test/integration/run-test.sh "tcp://127.0.0.1:10001" "/tmp/testmount2" "AzureChinaCloud"
+	sudo test/integration/run-test.sh "tcp://127.0.0.1:10001" "/tmp/testmount2" "AzureChinaCloud"
 fi

test/sanity/run-tests-all-clouds.sh

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# set -euo pipefail
+set -euo pipefail
 
 if [ ! -v AZURE_CREDENTIAL_FILE ]; then
 	export set AZURE_CREDENTIAL_FILE=/tmp/azure.json
@@ -38,8 +38,6 @@ if [ -v aadClientSecret ]; then
 	sed -i "s/location-input/$location/g" $AZURE_CREDENTIAL_FILE
 
 	sudo ${GO_BIN_PATH} test -v ./test/sanity/...
-	# make it always succeed for now until enabled sanity test on CI
-	exit 0
 else
 	if [ -v subscriptionId ]; then
 		echo "skip sanity test in CI env"