roolback the code about CRI of version v1alpha1

Signed-off-by: Starnop <starnop@163.com>
AliyunContainerService · Jul 23, 2018 · 999afc8 · 999afc8
1 parent 2f0b5cf
commit 999afc8
Show file tree

Hide file tree

Showing 20 changed files with 2,248 additions and 4,154 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,8 @@ notifications:
 env:
   - TEST_SUITE=unittest
   - TEST_SUITE=integrationtest
-  - TEST_SUITE=critest
+  - TEST_SUITE=criv1alpha1test
+  - TEST_SUITE=criv1alpha2test
 
 script: |
   if [[ "${TEST_SUITE}" = "unittest" ]]; then
@@ -33,13 +34,21 @@ script: |
     sudo env "PATH=$PATH" make download_dependencies
     sudo env "PATH=$PATH" make integration-test
     make coverage
+  elif [[ "${TEST_SUITE}" = "criv1alpha1test" ]]; then
+    make build
+    TEST_FLAGS= make build-daemon-integration
+    sudo env "PATH=$PATH" make install
+
+    sudo env "PATH=$PATH" make download_dependencies
+    sudo env "PATH=$PATH" make cri-v1alpha1-test
+    make coverage
   else
     make build
     TEST_FLAGS= make build-daemon-integration
     sudo env "PATH=$PATH" make install
 
     sudo env "PATH=$PATH" make download_dependencies
-    sudo env "PATH=$PATH" make cri-test
+    sudo env "PATH=$PATH" make cri-v1alpha2-test
     make coverage
   fi
   

diff --git a/Makefile b/Makefile
@@ -140,11 +140,17 @@ integration-test: ## run daemon integration-test
 	@mkdir -p coverage
 	./hack/testing/run_daemon_integration.sh
 
-.PHONY: cri-test
-cri-test: ## run v1 alpha2 cri-test
+.PHONY: cri-v1alpha1-test
+cri-v1alpha1-test: ## run v1 alpha1 cri-test
 	@echo $@
 	@mkdir -p coverage
-	./hack/testing/run_daemon_cri_integration.sh
+	./hack/testing/run_daemon_cri_integration.sh v1alpha1
+
+.PHONY: cri-v1alpha2-test
+cri-v1alpha2-test: ## run v1 alpha2 cri-test
+	@echo $@
+	@mkdir -p coverage
+	./hack/testing/run_daemon_cri_integration.sh v1alpha2
 
 .PHONY: test
 test: unit-test integration-test cri-test ## run the unit-test, integration-test and cri-test