The Wayback Machine - https://web.archive.org/web/20251014204253/https://github.com/moby/moby/pull/36749
Skip to content

Conversation

stevvooe
Copy link
Contributor

@stevvooe stevvooe commented Mar 30, 2018

Update docker-containerd to the latest 1.0.3-rc.0 to start getting the integration tests running. Once 1.0.3 official is released, we can merge this.

I am not sure if this the correct procedure. It looks like we are on 1.1 client but 1.0 binary. There may be other things to correct in this process.

After build, we get a binary with the proper version, so this seems close:

~/g/s/g/m/moby ❯❯❯ ./bundles/binary-daemon/docker-containerd --version                                                            update-containerd-1.0.3 ✭ ◼
containerd github.com/containerd/containerd v1.0.3-rc.0 2b3b44fd7d1cd1c8732918b8afcb8c84998f1e55

Gigantopithecus:

Signed-off-by: Stephen J Day stephen.day@docker.com

@codecov
Copy link

codecov bot commented Mar 30, 2018

Codecov Report

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

@@            Coverage Diff             @@
##           master   #36749      +/-   ##
==========================================
+ Coverage   34.93%   35.25%   +0.32%     
==========================================
  Files         614      614              
  Lines       45645    45645              
==========================================
+ Hits        15944    16091     +147     
+ Misses      27607    27423     -184     
- Partials     2094     2131      +37

Signed-off-by: Stephen J Day <stephen.day@docker.com>
@stevvooe stevvooe force-pushed the update-containerd-1.0.3 branch from bf90ada to 554d657 Compare April 2, 2018 20:43
@stevvooe stevvooe changed the title [WIP] containerd: update to 1.0.3 release containerd: update to 1.0.3 release Apr 2, 2018
@thaJeztah
Copy link
Member

Full diff: containerd/containerd@cfd0439...773c489

Copy link
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

Copy link
Contributor

@mlaventure mlaventure left a comment

Choose a reason for hiding this comment

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

LGTM

@stevvooe
Copy link
Contributor Author

stevvooe commented Apr 2, 2018

After the release update:

~/g/s/g/m/moby ❯❯❯ ./bundles/binary-daemon/docker-containerd --version                                                            update-containerd-1.0.3 ✭ ◼
containerd github.com/containerd/containerd v1.0.3 773c489c9c1b21a6d78b5c538cd395416ec50f88

Copy link
Contributor

@seemethere seemethere left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu
Copy link
Contributor

Flakey test is preventing a green run, investigating cause with #36501.

from console:

FAIL: docker_api_swarm_service_test.go:32: DockerSwarmSuite.TestAPIServiceUpdatePort

[d57cd26e783d9] waiting for daemon to start
[d57cd26e783d9] daemon started

docker_api_swarm_service_test.go:38:
    waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1)
docker_utils_test.go:452:
    c.Assert(v, checker, args...)
... obtained int = 0
... expected int = 1

[d57cd26e783d9] exiting daemon
FAIL: docker_cli_swarm_test.go:1610: DockerSwarmSuite.TestSwarmPublishDuplicatePorts

[da80a89aeec89] waiting for daemon to start
[da80a89aeec89] daemon started

docker_cli_swarm_test.go:1618:
    // make sure task has been deployed.
    waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1)
docker_utils_test.go:452:
    c.Assert(v, checker, args...)
... obtained int = 0
... expected int = 1

[da80a89aeec89] exiting daemon

Copy link
Contributor

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

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.

9 participants