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.

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

test: synchronize branch from tools-dev to release-1.12 in critest #2579

Conversation

chuanchang
Copy link
Contributor

Recently, there are many changes in pouch cri and k8s/cri-tools, our
cri-tools has given a synchronization and build a stable release-1.12
branch instead of old tools-dev, so need to synchronize it in pouch part.

Signed-off-by: Alex Jia chuanchang.jia@gmail.com

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗?)

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@codecov
Copy link

codecov bot commented Dec 19, 2018

Codecov Report

❗ No coverage uploaded for pull request base (master@3470d89). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #2579   +/-   ##
=========================================
  Coverage          ?   69.01%           
=========================================
  Files             ?      278           
  Lines             ?    18686           
  Branches          ?        0           
=========================================
  Hits              ?    12897           
  Misses            ?     4307           
  Partials          ?     1482
Flag Coverage Δ
#criv1alpha1test 31.23% <ø> (?)
#criv1alpha2test 35.74% <ø> (?)
#integrationtest 40.61% <ø> (?)
#nodee2etest 32.82% <ø> (?)
#unittest 26.66% <ø> (?)

@chuanchang
Copy link
Contributor Author

Fix CI failure: #2580

@chuanchang chuanchang force-pushed the sync_critest_branch_to_release-1.12 branch 2 times, most recently from 1ed91db to 1f8f573 Compare December 19, 2018 09:16
@chuanchang chuanchang changed the title hack.install.install_critest: synchronize branch from tools-dev to release-1.12 critest: synchronize branch from tools-dev to release-1.12 Dec 19, 2018
@chuanchang chuanchang changed the title critest: synchronize branch from tools-dev to release-1.12 test: synchronize branch from tools-dev to release-1.12 in critest Dec 19, 2018
@zhuangqh
Copy link
Contributor

@chuanchang
Copy link
Contributor Author

chuanchang commented Dec 19, 2018

unnecessary to skip seccomp localhost test. please update
https://github.com/alibaba/pouch/blob/master/hack/testing/run_daemon_cri_integration.sh#L21

@chuanchang

In fact, it still depends on specific kernel version, although the result is okay in travis CI, anyway, I can update it.

Recently, there are many changes in pouch cri and k8s/cri-tools, our
cri-tools has given a synchronization and build a stable release-1.12
branch instead of old tools-dev, so need to synchronize it in pouch part.

Signed-off-by: Alex Jia <chuanchang.jia@gmail.com>
@chuanchang chuanchang force-pushed the sync_critest_branch_to_release-1.12 branch from 1f8f573 to 43f15d4 Compare December 19, 2018 14:20
Copy link
Contributor

@zhuangqh zhuangqh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@zhuangqh zhuangqh merged commit a3d6a2b into AliyunContainerService:master Dec 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants