[bug]: roolback the code about CRI of version v1alpha1 #1755
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #1755 +/- ##
========================================
+ Coverage 56.3% 62.1% +5.8%
========================================
Files 200 200
Lines 15657 15565 -92
========================================
+ Hits 8816 9667 +851
+ Misses 5745 4651 -1094
- Partials 1096 1247 +151
|
starnop
force-pushed
the
cri-roolback-v1alpha1
branch
7 times, most recently
from
83cbdbf to
03a5701
Compare
|
it seems that you forgot to change the Makefile and .travis.yml. We need four jobs here. |
fuweid
suggested changes
Jul 20, 2018
fuweid
reviewed
Jul 23, 2018
| CRITEST_VERSION="1.0.0-alpha.0" | ||
| else | ||
| CRITEST_VERSION="1.0.0-beta.0" | ||
| fi |
| if [[ "${cri_runtime}" == "v1alpha1" ]]; then | ||
| echo "run v1alpha1 test" | ||
| critest --runtime-endpoint=${POUCH_SOCK} \ | ||
| --focus="${CRI_FOCUS}" --ginkgo-flags="--skip=\"${CRI_SKIP}\"" validation |
| --focus="${CRI_FOCUS}" --ginkgo-flags="--skip=\"${CRI_SKIP}\"" validation | ||
| else | ||
| echo "run v1alpha2 test" | ||
| critest --runtime-endpoint=${POUCH_SOCK} \ | ||
| --ginkgo.focus="${CRI_FOCUS}" --ginkgo.skip="${CRI_SKIP}" |
| local cmd flags | ||
| integration::run_cri_test(){ | ||
| local cri_runtime cmd flags | ||
| cri_runtime=$1 | ||
| cmd="pouchd-integration" | ||
| flags=" -test.coverprofile=${coverage_profile} DEVEL" |
There was a problem hiding this comment.
we should use different coverage-profile for alpha1 otherwise the alpha2 will override the result.
|
|
||
| main() { | ||
| integration::install_cni | ||
| cri_runtime="v1alpha1" |
There was a problem hiding this comment.
please run integration::run_cri_test "${cri_runtime}" don't use global cri_runtime. If you have to, please use local to consume the cri_runtime to avoid the global variable pollution
| { | ||
| "checksumSHA1": "oRQMrak6qTTdEUnRUMtVpzO9T/A=", | ||
| "path": "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime", | ||
| "revision": "18758f502c4a249bf999f34e4a115ec9881cd9f2", |
There was a problem hiding this comment.
@YaoZengzeng it's correct about the revision?
starnop
force-pushed
the
cri-roolback-v1alpha1
branch
5 times, most recently
from
92de646 to
321a6fb
Compare
fuweid
reviewed
Jul 23, 2018
There was a problem hiding this comment.
basically, the change is ok to me. @YaoZengzeng Please help to check again. Thanks
|
|
||
| # daemon cri integration coverage profile | ||
| coverage_profile="${REPO_BASE}/coverage/integration_daemon_cri_${cri_runtime}_profile.out" | ||
| echo "${coverage_profile}" |
There was a problem hiding this comment.
please remove this line. we can use bash -x to check the value~
starnop
force-pushed
the
cri-roolback-v1alpha1
branch
4 times, most recently
from
999afc8 to
797aa95
Compare
|
LGTM. |
fuweid
reviewed
Jul 23, 2018
Makefile
Outdated
| 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 |
fuweid
reviewed
Jul 23, 2018
| critest --runtime-endpoint=${POUCH_SOCK} \ | ||
| --ginkgo.focus="${CRI_FOCUS}" --ginkgo.skip="${CRI_SKIP}" | ||
| if [[ "${cri_runtime}" == "v1alpha1" ]]; then | ||
| echo "run v1alpha1 test" |
There was a problem hiding this comment.
We can use the above line start pouch daemon cri integration test... to show the version, like
start pouch daemon cri-${version} integration test.... Does it make senses to you?
fuweid
reviewed
Jul 23, 2018
| critest --runtime-endpoint=${POUCH_SOCK} \ | ||
| --focus="${CRI_FOCUS}" --ginkgo-flags="--skip=\"${CRI_SKIP}\"" validation | ||
| else | ||
| echo "run v1alpha2 test" |
starnop
force-pushed
the
cri-roolback-v1alpha1
branch
from
797aa95 to
ea78a5d
Compare
Signed-off-by: Starnop <starnop@163.com>
starnop
force-pushed
the
cri-roolback-v1alpha1
branch
from
ea78a5d to
10bbe90
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Starnop starnop@163.com
Ⅰ. Describe what this PR did
For CRI expansion requirements,the code about CRI of version v1alpha1 fail the test. Meanwhile,we only need to expand v1alpha2. So we roolback the code about CRI of version v1alpha1.
Ⅱ. Does this pull request fix one issue?
none
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews