Skip to content

Bump containerd v1.2.6, runc 029124da7af7360afa781a0234d1b083550f797c#39016

Merged
AkihiroSuda merged 3 commits intomoby:masterfrom
tao12345666333:bump-containerd-v1.2.6
Apr 9, 2019
Merged

Bump containerd v1.2.6, runc 029124da7af7360afa781a0234d1b083550f797c#39016
AkihiroSuda merged 3 commits intomoby:masterfrom
tao12345666333:bump-containerd-v1.2.6

Conversation

@tao12345666333
Copy link
Copy Markdown
Contributor

@tao12345666333 tao12345666333 commented Apr 6, 2019

@tao12345666333 tao12345666333 requested a review from tianon as a code owner April 6, 2019 17:02
@tao12345666333 tao12345666333 mentioned this pull request Apr 6, 2019
Closed
@tao12345666333 tao12345666333 changed the title Bump containerd v1.2.6 Bump containerd v1.2.6, runc 029124da7af7360afa781a0234d1b083550f797c Apr 6, 2019
@tao12345666333 tao12345666333 force-pushed the bump-containerd-v1.2.6 branch from 62c2ee1 to 06d3a53 Compare April 6, 2019 18:15
@tao12345666333
Copy link
Copy Markdown
Contributor Author

tao12345666333 commented Apr 6, 2019

The CI faild. I check the Jenkins's build log. And I found some message below:

01:13:26 Successfully tagged docker-s390x:62c2ee1
01:13:28 ?   	github.com/docker/docker/api	[no test files]
01:13:40 ok  	github.com/docker/docker/api/server	0.005s	coverage: 7.9% of statements
01:13:41 vendor/github.com/moby/buildkit/session/content/attachable.go:9:2: cannot find package "github.com/containerd/containerd/services/content/contentserver" in any of:
01:13:41 	/go/src/github.com/docker/docker/vendor/github.com/containerd/containerd/services/content/contentserver (vendor tree)
01:13:41 	/usr/local/go/src/github.com/containerd/containerd/services/content/contentserver (from $GOROOT)
01:13:41 	/go/src/github.com/containerd/containerd/services/content/contentserver (from $GOPATH)
01:13:41 Build step 'Execute shell' marked build as failure
01:13:41 Set build name.

the full log at https://jenkins.dockerproject.org/job/Docker-PRs-s390x/13873/console .

I think this is the cause of the failure.

When I manually execute vndr -verbose -strict I get some warning

2019/04/06 18:23:14     WARNING(verbose) github.com/containerd/containerd/services/content/contentserver: cannot
find package "github.com/containerd/containerd/services/content/contentserver" in any of:                       
        /go/src/github.com/docker/docker/vendor/github.com/containerd/containerd/services/content/contentserver (
vendor tree)                             
        /go/src/github.com/docker/docker/vendor/github.com/containerd/containerd/services/content/contentserver
        /usr/local/go/src/github.com/containerd/containerd/services/content/contentserver (from $GOROOT)
        /go/src/github.com/containerd/containerd/services/content/contentserver (from $GOPATH)
2019/04/06 18:23:14 Clean vendor dir from unused packages
2019/04/06 18:23:15 Success

When I execute hack/verdor.sh, it does delete those vendor/github.com/containerd/containerd/services/content/contentserver files.

@tao12345666333
Copy link
Copy Markdown
Contributor Author

tao12345666333 commented Apr 8, 2019

@thaJeztah PTAL. If my operation is wrong, please let me know. Thanks. ❤️

@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented Apr 8, 2019

Thanks for working on this!

Hm, let me check what's happening 👍

thaJeztah
thaJeztah reviewed Apr 8, 2019
View reviewed changes
thaJeztah
thaJeztah requested changes Apr 8, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM after the last commit is removed (and CI goes green 😅)

@tao12345666333 tao12345666333 force-pushed the bump-containerd-v1.2.6 branch from 06d3a53 to c28171c Compare April 8, 2019 12:29
thaJeztah
thaJeztah approved these changes Apr 8, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, thank you so much!

@tao12345666333
Copy link
Copy Markdown
Contributor Author

tao12345666333 commented Apr 8, 2019

Thanks for your help. @thaJeztah 👍

@tao12345666333
Copy link
Copy Markdown
Contributor Author

tao12345666333 commented Apr 8, 2019

That build task windowsRS5-process seems to have failed because of the timeout.

20:30:03 INFO: Commit hash is 125e76f03b
20:30:03 INFO: Nuke-Everything...
20:30:03 INFO: Container count on control daemon to delete is 0
23:49:59 Build timed out (after 200 minutes). Marking the build as failed.
23:49:59 Set build name.
23:49:59 New build name is '#39016'
23:49:59 Build was aborted
23:49:59 [PostBuildScript] - Executing post build scripts.
23:49:59 Notifying endpoint with url 'https://leeroy.dockerproject.org/notification/jenkins'
23:49:59 Finished: FAILURE

Do we have any way to trigger it only? @thaJeztah
Thanks. 👍

@codecov
Copy link
Copy Markdown

codecov bot commented Apr 9, 2019

Codecov Report

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

@@            Coverage Diff            @@
##             master   #39016   +/-   ##
=========================================
  Coverage          ?   36.89%           
=========================================
  Files             ?      613           
  Lines             ?    45421           
  Branches          ?        0           
=========================================
  Hits              ?    16758           
  Misses            ?    26372           
  Partials          ?     2291

@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented Apr 9, 2019

@vdemeester @AkihiroSuda ptal

@AkihiroSuda AkihiroSuda merged commit 9d850cb into moby:master Apr 9, 2019
@tao12345666333 tao12345666333 deleted the bump-containerd-v1.2.6 branch April 9, 2019 08:13
@tao12345666333
Copy link
Copy Markdown
Contributor Author

tao12345666333 commented Apr 9, 2019

Thanks all. ❤️

@thaJeztah thaJeztah mentioned this pull request Apr 9, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@tianon tianon Awaiting requested review from tianon tianon is a code owner

Assignees

No one assigned

Labels

area/runtime Runtime impact/changelog status/2-code-review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tao12345666333 @thaJeztah @AkihiroSuda @GordonTheTurtle