test: add cri test for pouch #524

czm4514 · 2018-01-09T06:39:13Z

Signed-off-by: czm4514 [email protected]

1.Describe what this PR did
this PR is to add cri test for pouch.
2.Does this pull request fix one issue?

3.Describe how you did it
i use the cri-tools project to add cri test for pouch. there are lots of test cases in the project.
4.Describe how to verify it
when you run the test-cri.sh ,
./test-cri.sh
you could get the information like this(the variable focus is set to "Runtime"):

/root/gocodes/bin/critest
1 attempt "ctr version"! Trying again in 1 seconds...
2 attempt "ctr version"! Trying again in 2 seconds...
3 attempt "ctr version"! Trying again in 3 seconds...
4 attempt "ctr version"! Trying again in 4 seconds...
Running Suite: E2ECRI Suite
===========================
Random Seed: 1515481734 - Will randomize all specs
Will run 2 of 55 specs

SSSSSSSSSSSSSSSS
------------------------------
[k8s.io] Runtime info runtime should support returning runtime info
  runtime should return runtime conditions [Conformance]
  /root/gocodes/src/github.com/kubernetes-incubator/cri-tools/pkg/validate/runtime_info.go:48
[BeforeEach] [k8s.io] Runtime info
  /root/gocodes/src/github.com/kubernetes-incubator/cri-tools/pkg/framework/framework.go:50
[BeforeEach] [k8s.io] Runtime info
  /root/gocodes/src/github.com/kubernetes-incubator/cri-tools/pkg/validate/runtime_info.go:39
[It] runtime should return runtime conditions [Conformance]
  /root/gocodes/src/github.com/kubernetes-incubator/cri-tools/pkg/validate/runtime_info.go:48
STEP: test runtime status
[AfterEach] [k8s.io] Runtime info
  /root/gocodes/src/github.com/kubernetes-incubator/cri-tools/pkg/framework/framework.go:51
•SSSSSSSSSSSSSSSSSSSSSSS
------------------------------
[k8s.io] Runtime info runtime should support returning runtime info
  runtime should return version info [Conformance]
  /root/gocodes/src/github.com/kubernetes-incubator/cri-tools/pkg/validate/runtime_info.go:43
[BeforeEach] [k8s.io] Runtime info
  /root/gocodes/src/github.com/kubernetes-incubator/cri-tools/pkg/framework/framework.go:50
[BeforeEach] [k8s.io] Runtime info
  /root/gocodes/src/github.com/kubernetes-incubator/cri-tools/pkg/validate/runtime_info.go:39
[It] runtime should return version info [Conformance]
  /root/gocodes/src/github.com/kubernetes-incubator/cri-tools/pkg/validate/runtime_info.go:43
Jan  9 15:08:54.098: INFO: Get version info succeed
[AfterEach] [k8s.io] Runtime info
  /root/gocodes/src/github.com/kubernetes-incubator/cri-tools/pkg/framework/framework.go:51
•SSSSSSSSSSSSSS
Ran 2 of 55 Specs in 0.004 seconds
SUCCESS! -- 2 Passed | 0 Failed | 0 Pending | 53 Skipped PASS

Ginkgo ran 1 suite in 85.546375ms
Test Suite Passed
./test-utils.sh: line 54: 13560 Terminated              keepalive "containerd" ${RESTART_WAIT_PERIOD} &>${report_dir}/containerd.log
./test-utils.sh: line 54: 13694 Terminated              keepalive "pouchd ${POUCH_FLAGS}" ${RESTART_WAIT_PERIOD} &>${report_dir}/pouch.log

5.Special notes for reviews
when you want to run Specified test case ，you can through the param "--focus" to filter. you can get mor informations from https://github.com/kubernetes-incubator/cri-tools. you can use the cri-tools through the command: critest -f "image status|public image" validation

pouchrobot · 2018-01-09T06:39:21Z

We found this is your first time to contribute to Pouch, @czm4514
👏 We really appreciate it.
Just remind that you have read the contribution guide: https://github.com/alibaba/pouch/blob/master/CONTRIBUTING.md
If you didn't, you should do that first. If done, welcome again and please enjoy hacking! 🍻

czm4514 · 2018-01-09T06:46:36Z

do you have any idea about this feature?
@Letty5411

allencloud · 2018-01-09T06:49:56Z

Please finish details about the PR description. And sign off your commits.

codecov-io · 2018-01-09T06:52:11Z

Codecov Report

Merging #524 into master will increase coverage by 5.97%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master     #524      +/-   ##
==========================================
+ Coverage   14.49%   20.47%   +5.97%     
==========================================
  Files          64       39      -25     
  Lines        3173     2056    -1117     
==========================================
- Hits          460      421      -39     
+ Misses       2666     1590    -1076     
+ Partials       47       45       -2

Impacted Files	Coverage Δ
daemon/mgr/container_types.go	`0% <0%> (-18.19%)`	⬇️
cli/volume.go
cli/cli.go
cli/rename.go
cli/unpause.go
cli/main.go
cli/exec.go
cli/rmi.go
cli/command.go
cli/inspect.go
... and 16 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 580accd...e5ac03a. Read the comment docs.

allencloud · 2018-01-09T07:24:55Z

Could you help this to integration test system in hack/make.sh? @Letty5411

Letty5411 · 2018-01-09T07:48:06Z

hack/cri-test/versions

@@ -0,0 +1,3 @@
+RUNC_VERSION=74a17296470088de3805e138d3d87c62e613dfc4
+CONTAINERD_VERSION=6c7abf7c76c1973d4fb4b0bad51691de84869a51


RUNC_VERSION and CONTAINERD_VERSION are not used.

yes，It's really not used

I have removed unused variables

Letty5411 · 2018-01-09T07:51:52Z

hack/cri-test/test-utils.sh

+  fi
+  sudo pkill containerd
+  keepalive "containerd" ${RESTART_WAIT_PERIOD} &> ${report_dir}/containerd.log &
+  containerd_pid=$!


line 39-41, please check the existence of containerd first, kill it only if containerd doesn't exist.

Letty5411 · 2018-01-09T07:55:14Z

hack/cri-test/test-utils.sh

+  keepalive "pouchd ${POUCH_FLAGS}" \
+	  ${RESTART_WAIT_PERIOD} &> ${report_dir}/pouch.log &
+  pouch_pid=$!
+  readiness_check "pouch version"


line 47-50, please also check pouchd process first

Letty5411 · 2018-01-09T07:59:22Z

@czm4514 Please also use 'git rebase -i HEAD~N' to rebase this PR.

Letty5411 · 2018-01-09T08:03:46Z

hack/cri-test/test-cri.sh

+FOCUS=${FOCUS:-""}
+
+# SKIP skips the test to skip.
+SKIP=${SKIP:-""}


Change the ENV FOCUS SKIP to CRI_FOCUS,CRI_SKIP

allencloud · 2018-01-09T08:05:35Z

After

Please also use 'git rebase -i HEAD~N' to rebase this PR.

Please git commit -s --amend to sign off you commit.

Maybe you need to git config --user and git config --email to add you personnel info at first. @czm4514

CLAassistant · 2018-01-09T08:08:03Z

All committers have signed the CLA.

Letty5411 · 2018-01-09T08:23:09Z

Also change the title from "feature:" to "test:", the same to the commit message. As this is a test PR.

Signed-off-by: czm4514 <[email protected]>

Letty5411 · 2018-01-11T04:56:29Z

LGTM

allencloud · 2018-01-11T05:44:05Z

Feel so good to see the merging. Thanks very much for your work. @czm4514

pouchrobot added areas/test size/L labels Jan 9, 2018

czm4514 changed the title ~~add cri test for pouch~~ feature: add cri test for pouch Jan 9, 2018

pouchrobot added the kind/feature label Jan 9, 2018

Letty5411 reviewed Jan 9, 2018

View reviewed changes

allencloud added this to the v0.1-Milestone milestone Jan 9, 2018

czm4514 changed the title ~~feature: add cri test for pouch~~ test: add cri test for pouch Jan 10, 2018

czm4514 force-pushed the master branch from 342c0a4 to bb8d69b Compare January 11, 2018 04:25

add cri-test for Pouch project

e5ac03a

Signed-off-by: czm4514 <[email protected]>

czm4514 force-pushed the master branch from bb8d69b to e5ac03a Compare January 11, 2018 04:33

pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Jan 11, 2018

Letty5411 merged commit e46d85b into AliyunContainerService:master Jan 11, 2018

Letty5411 mentioned this pull request Jan 11, 2018

test: integrate cri-test into CI #557

Merged

pouchrobot mentioned this pull request Jan 12, 2018

Weekly Report of Pouch from 2018-01-05 to 2018-01-12 #572

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: add cri test for pouch #524

test: add cri test for pouch #524

czm4514 commented Jan 9, 2018 •

edited

Loading

pouchrobot commented Jan 9, 2018

czm4514 commented Jan 9, 2018 •

edited

Loading

allencloud commented Jan 9, 2018

codecov-io commented Jan 9, 2018 •

edited

Loading

allencloud commented Jan 9, 2018

Letty5411 Jan 9, 2018

czm4514 Jan 9, 2018

czm4514 Jan 10, 2018

Letty5411 Jan 9, 2018

Letty5411 Jan 9, 2018

Letty5411 commented Jan 9, 2018

Letty5411 Jan 9, 2018 •

edited

Loading

allencloud commented Jan 9, 2018

CLAassistant commented Jan 9, 2018 •

edited

Loading

Letty5411 commented Jan 9, 2018

Letty5411 commented Jan 11, 2018

allencloud commented Jan 11, 2018

		@@ -0,0 +1,3 @@
		RUNC_VERSION=74a17296470088de3805e138d3d87c62e613dfc4
		CONTAINERD_VERSION=6c7abf7c76c1973d4fb4b0bad51691de84869a51

test: add cri test for pouch #524

test: add cri test for pouch #524

Conversation

czm4514 commented Jan 9, 2018 • edited Loading

pouchrobot commented Jan 9, 2018

czm4514 commented Jan 9, 2018 • edited Loading

allencloud commented Jan 9, 2018

codecov-io commented Jan 9, 2018 • edited Loading

Codecov Report

allencloud commented Jan 9, 2018

Letty5411 Jan 9, 2018

Choose a reason for hiding this comment

czm4514 Jan 9, 2018

Choose a reason for hiding this comment

czm4514 Jan 10, 2018

Choose a reason for hiding this comment

Letty5411 Jan 9, 2018

Choose a reason for hiding this comment

Letty5411 Jan 9, 2018

Choose a reason for hiding this comment

Letty5411 commented Jan 9, 2018

Letty5411 Jan 9, 2018 • edited Loading

Choose a reason for hiding this comment

allencloud commented Jan 9, 2018

CLAassistant commented Jan 9, 2018 • edited Loading

Letty5411 commented Jan 9, 2018

Letty5411 commented Jan 11, 2018

allencloud commented Jan 11, 2018

czm4514 commented Jan 9, 2018 •

edited

Loading

czm4514 commented Jan 9, 2018 •

edited

Loading

codecov-io commented Jan 9, 2018 •

edited

Loading

Letty5411 Jan 9, 2018 •

edited

Loading

CLAassistant commented Jan 9, 2018 •

edited

Loading