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: use runc build from source code #2652

Merged
merged 1 commit into from
Jan 7, 2019
Merged

test: use runc build from source code #2652

merged 1 commit into from
Jan 7, 2019

Conversation

Ace-Tang
Copy link
Contributor

@Ace-Tang Ace-Tang commented Jan 7, 2019

build runc from alibaba/runc source code when running ci test,
or every month when we cherry-pick commit from opencontainers/runc,
we need to release a new version.

Signed-off-by: Ace-Tang aceapril@126.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 Jan 7, 2019

Codecov Report

Merging #2652 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2652      +/-   ##
==========================================
- Coverage   69.58%   69.56%   -0.02%     
==========================================
  Files         280      280              
  Lines       18845    18845              
==========================================
- Hits        13113    13110       -3     
- Misses       4263     4267       +4     
+ Partials     1469     1468       -1
Flag Coverage Δ
#criv1alpha1test 31.23% <ø> (-0.25%) ⬇️
#criv1alpha2test 35.68% <ø> (+0.01%) ⬆️
#integrationtest 41.66% <ø> (-0.03%) ⬇️
#nodee2etest 32.73% <ø> (-0.04%) ⬇️
#unittest 26.91% <ø> (ø) ⬆️
Impacted Files Coverage Δ
ctrd/image.go 75.9% <0%> (-2.28%) ⬇️
daemon/mgr/spec_linux.go 76.74% <0%> (-1%) ⬇️
cri/v1alpha1/cri.go 59.43% <0%> (-0.67%) ⬇️
daemon/mgr/container.go 59% <0%> (ø) ⬆️
cri/v1alpha2/cri.go 67.82% <0%> (+0.24%) ⬆️
ctrd/container.go 59.28% <0%> (+0.39%) ⬆️
cri/v1alpha2/cri_wrapper.go 65.59% <0%> (+1.19%) ⬆️
daemon/logger/jsonfile/utils.go 73.17% <0%> (+1.62%) ⬆️

build runc from alibaba/runc source code when running ci test,
or every month when we cherry-pick commit from opencontainers/runc,
we need to release a new version.

Signed-off-by: Ace-Tang <aceapril@126.com>
chmod +x /usr/local/bin/runc.amd64
mv /usr/local/bin/runc.amd64 /usr/local/bin/runc
gopath="${GOPATH}/src/github.com/opencontainers/runc"
git clone -b develop https://github.com/alibaba/runc.git "${gopath}"
Copy link
Contributor

Choose a reason for hiding this comment

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

We also need to update the package script https://github.com/pouchcontainer/project.

Copy link
Contributor

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid fuweid merged commit 5bc5981 into AliyunContainerService:master Jan 7, 2019
@houstar
Copy link
Contributor

houstar commented Jan 8, 2019

Also please update 'Makefile' inside pouch source code to support cross-building.

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.

4 participants