Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bug]: roolback the code about CRI of version v1alpha1 #1755

Merged
merged 1 commit into from
Jul 24, 2018
Merged

[bug]: roolback the code about CRI of version v1alpha1 #1755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
14 changes: 10 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,20 @@ 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-v1alpha1-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-v1alpha2-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
test: unit-test integration-test cri-v1alpha1-test cri-v1alpha2-test ## run the unit-test, integration-test , cri-v1alpha1-test and cri-v1alpha2-test

.PHONY: coverage
coverage: ## combine coverage after test
Expand Down
Loading