Merge pull request #1098 from Letty5411/0411

test: seperate integration test and cri test in travisCI

Author: allencloud

.travis.yml

@@ -18,5 +18,9 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y -qq autoconf automake
 
+env:
+  - TEST_SUITE=integration-test
+  - TEST_SUITE=cri-test
+
 script:
-  - sudo make -e test
+  - sudo make -e ${TEST_SUITE}

Makefile

@@ -97,11 +97,11 @@ uninstall:
 # Ref https://unix.stackexchange.com/questions/83191/how-to-make-sudo-preserve-path
 .PHONY: integration-test
 integration-test:
-	@bash -c "env PATH=$(PATH) hack/make.sh pre build integration-test"
+	@bash -c "env PATH=$(PATH) hack/make.sh build integration-test"
 
 .PHONY: cri-test
 cri-test:
-	@bash -c "env PATH=$(PATH) hack/make.sh pre build cri-test"
+	@bash -c "env PATH=$(PATH) hack/make.sh build cri-test"
 
 .PHONY: test
 test:

hack/make.sh

@@ -9,6 +9,12 @@ DIR="$( cd "$( dirname "$0" )/.." && pwd )"
 cd $DIR/
 SOURCEDIR=/go/src/github.com/alibaba/pouch
 IMAGE=pouch:test
+if [[ $SOURCEDIR != $DIR ]];then
+	[ -d $SOURCEDIR ] && rm -rf $SOURCEDIR
+	POUCHTOPDIR=$(dirname $SOURCEDIR)
+	[ ! -d $POUCHTOPDIR ] && mkdir -p $POUCHTOPDIR
+	ln -sf $DIR/ $SOURCEDIR
+fi
 
 # install pouch and essential binaries: containerd, runc and so on
 function install_pouch ()
@@ -88,13 +94,6 @@ function target()
 	    install_dumb_init || echo "Warning: dumb-init install failed! rich container related tests will be skipped"
 		docker run --rm -v $(pwd):$SOURCEDIR $IMAGE bash -c "cd test && go test -c -o integration-test"
 
-		if [[ $SOURCEDIR != $DIR ]];then
-			[ -d $SOURCEDIR ] && rm -rf $SOURCEDIR
-			POUCHTOPDIR=$(dirname $SOURCEDIR)
-			[ ! -d $POUCHTOPDIR ] && mkdir -p $POUCHTOPDIR
-			ln -sf $DIR/ $SOURCEDIR
-		fi
-
 		#start pouch daemon
 		echo "start pouch daemon"
 		if stat /usr/bin/lxcfs ; then