Skip to content

Commit 797aa95

Browse files
committed
roolback the code about CRI of version v1alpha1
Signed-off-by: Starnop <[email protected]>
1 parent 2f0b5cf commit 797aa95

File tree

20 files changed

+2248
-4154
lines changed

20 files changed

+2248
-4154
lines changed

.travis.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ notifications:
1717
env:
1818
- TEST_SUITE=unittest
1919
- TEST_SUITE=integrationtest
20-
- TEST_SUITE=critest
20+
- TEST_SUITE=criv1alpha1test
21+
- TEST_SUITE=criv1alpha2test
2122

2223
script: |
2324
if [[ "${TEST_SUITE}" = "unittest" ]]; then
@@ -33,13 +34,21 @@ script: |
3334
sudo env "PATH=$PATH" make download_dependencies
3435
sudo env "PATH=$PATH" make integration-test
3536
make coverage
37+
elif [[ "${TEST_SUITE}" = "criv1alpha1test" ]]; then
38+
make build
39+
TEST_FLAGS= make build-daemon-integration
40+
sudo env "PATH=$PATH" make install
41+
42+
sudo env "PATH=$PATH" make download_dependencies
43+
sudo env "PATH=$PATH" make cri-v1alpha1-test
44+
make coverage
3645
else
3746
make build
3847
TEST_FLAGS= make build-daemon-integration
3948
sudo env "PATH=$PATH" make install
4049
4150
sudo env "PATH=$PATH" make download_dependencies
42-
sudo env "PATH=$PATH" make cri-test
51+
sudo env "PATH=$PATH" make cri-v1alpha2-test
4352
make coverage
4453
fi
4554

Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,17 @@ integration-test: ## run daemon integration-test
140140
@mkdir -p coverage
141141
./hack/testing/run_daemon_integration.sh
142142

143-
.PHONY: cri-test
144-
cri-test: ## run v1 alpha2 cri-test
143+
.PHONY: cri-v1alpha1-test
144+
cri-v1alpha1-test: ## run v1 alpha1 cri-test
145145
@echo $@
146146
@mkdir -p coverage
147-
./hack/testing/run_daemon_cri_integration.sh
147+
./hack/testing/run_daemon_cri_integration.sh v1alpha1
148+
149+
.PHONY: cri-v1alpha2-test
150+
cri-v1alpha2-test: ## run v1 alpha2 cri-test
151+
@echo $@
152+
@mkdir -p coverage
153+
./hack/testing/run_daemon_cri_integration.sh v1alpha2
148154

149155
.PHONY: test
150156
test: unit-test integration-test cri-test ## run the unit-test, integration-test and cri-test

0 commit comments

Comments
 (0)