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

Makefile: add commit for the version #2980

Merged
merged 1 commit into from
Oct 14, 2019
Merged

Makefile: add commit for the version #2980

merged 1 commit into from
Oct 14, 2019

Conversation

fuweid
Copy link
Contributor

@fuweid fuweid commented Oct 11, 2019

Signed-off-by: Wei Fu fuweid89@gmail.com

Ⅰ. Describe what this PR did

Since kubernetes will use version in node list, v1.3.0 is too general
and we cannot tell no thing. Based on this, we can set the last commit
for the version.

Ⅱ. Does this pull request fix one issue?

none

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

no need

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@codecov
Copy link

codecov bot commented Oct 11, 2019

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2980      +/-   ##
==========================================
- Coverage   68.19%   68.08%   -0.11%     
==========================================
  Files         291      291              
  Lines       18366    18366              
==========================================
- Hits        12524    12504      -20     
- Misses       4383     4396      +13     
- Partials     1459     1466       +7
Flag Coverage Δ
#criv1alpha2_test 34.75% <ø> (-0.04%) ⬇️
#integration_test_0 36.16% <ø> (ø) ⬆️
#integration_test_1 35.55% <ø> (-0.01%) ⬇️
#integration_test_2 36.11% <ø> (-0.04%) ⬇️
#integration_test_3 35.6% <ø> (-0.01%) ⬇️
#node_e2e_test 34.07% <ø> (-0.12%) ⬇️
#unittest 27.92% <ø> (ø) ⬆️
Impacted Files Coverage Δ
ctrd/watch.go 72.97% <0%> (-5.41%) ⬇️
ctrd/container.go 51.68% <0%> (-1.5%) ⬇️
ctrd/supervisord/daemon.go 49.32% <0%> (-1.36%) ⬇️
cri/ocicni/cni_manager.go 61.32% <0%> (-0.95%) ⬇️
daemon/mgr/container.go 60.02% <0%> (-0.42%) ⬇️
cri/v1alpha2/cri.go 63.84% <0%> (ø) ⬆️

@fuweid fuweid requested a review from zhuangqh October 11, 2019 03:15
@zhuangqh
Copy link
Contributor

test fail, please repush

@fuweid
Copy link
Contributor Author

fuweid commented Oct 11, 2019

FAIL: cli_events_test.go:72: PouchEventsSuite.TestExecDieEventWorks
cli_events_test.go:101:
    c.Errorf("exec_start event check error: %v", err)
... Error: exec_start event check error: unexpected output 2019-10-11T03:33:22.246610606Z container exec_die 91570b595e73a2ef1e25e2275baa8d605508c05888d1f07d0269b820b5d69c40 (execID=7a99960a229fd66b87cbad40502b44659f6ec9ea1351b1f94ab4cb2d7f81fdf6, exitCode=0, image=registry.hub.docker.com/library/busybox:1.28, name=test-exec-die-event-works): should be exec_start events
cli_events_test.go:105:
    c.Errorf("exec_die event check error: %v", err)
... Error: exec_die event check error: unexpected output 2019-10-11T03:33:22.289086603Z container exec_start 91570b595e73a2ef1e25e2275baa8d605508c05888d1f07d0269b820b5d69c40 (image=registry.hub.docker.com/library/busybox:1.28, name=test-exec-die-event-works): should be exec_die events

There is flaky case. I will take look this and update soon.

@fuweid fuweid changed the title Makefile: add commit for the version [WIP] Makefile: add commit for the version Oct 11, 2019
Since kubernetes will use version in node list, v1.3.0 is too general
and we cannot tell no thing. Based on this, we can set the last commit
for the version.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
@fuweid fuweid changed the title [WIP] Makefile: add commit for the version Makefile: add commit for the version Oct 14, 2019
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 5a83e1e into AliyunContainerService:master Oct 14, 2019
@fuweid fuweid deleted the me-improve-version branch October 14, 2019 07:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants