Skip to content

Update cloudflare/cfssl to 1.3.2#37390

Merged
vdemeester merged 1 commit intomoby:masterfrom
thaJeztah:update_cfssl_for_swarmkit
Jul 9, 2018
Merged

Update cloudflare/cfssl to 1.3.2#37390
vdemeester merged 1 commit intomoby:masterfrom
thaJeztah:update_cfssl_for_swarmkit

Conversation

@thaJeztah
Copy link
Member

Matching the version that is used in SwarmKit; the equivalent SwarmKit PR is moby/swarmkit#2644

  • github.com/cloudflare/cfssl updated to 1.3.2; cloudflare/cfssl@7fb22c8...1.3.2
  • github.com/google/certificate-transparency moved to github.com/google/certificate-transparency-go, and updated to 5ab67e519c93568ac3ee50fd6772a5bcf8aa460d (matching SwarmKit)
  • golang.org/x/crypto not updated; was already ahead; golang/crypto@650f4a3...1a580b3

@thaJeztah
Copy link
Member Author

ping @cyli @justincormack @dperny PTAL

Matching the version that is used in SwarmKit

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the update_cfssl_for_swarmkit branch from d9e95c1 to 7084487 Compare July 4, 2018 15:47
@thaJeztah
Copy link
Member Author

Janky https://jenkins.dockerproject.org/job/Docker-PRs/49958/console failing on #36501

17:13:01 FAIL: docker_api_swarm_service_test.go:33: DockerSwarmSuite.TestAPIServiceUpdatePort
17:13:01 
17:13:01 [dde612639de8b] waiting for daemon to start
17:13:01 [dde612639de8b] daemon started
17:13:01 
17:13:01 docker_api_swarm_service_test.go:39:
17:13:01     waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1)
17:13:01 docker_utils_test.go:435:
17:13:01     c.Assert(v, checker, args...)
17:13:01 ... obtained int = 0
17:13:01 ... expected int = 1
17:13:01 
17:13:01 [dde612639de8b] exiting daemon

17:38:00 FAIL: docker_cli_swarm_test.go:1605: DockerSwarmSuite.TestSwarmPublishDuplicatePorts
17:38:00 
17:38:00 [de37804d7b874] waiting for daemon to start
17:38:00 [de37804d7b874] daemon started
17:38:00 
17:38:00 docker_cli_swarm_test.go:1613:
17:38:00     // make sure task has been deployed.
17:38:00     waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1)
17:38:00 docker_utils_test.go:435:
17:38:00     c.Assert(v, checker, args...)
17:38:00 ... obtained int = 0
17:38:00 ... expected int = 1
17:38:00 
17:38:00 [de37804d7b874] exiting daemon

@thaJeztah
Copy link
Member Author

s390x/z https://jenkins.dockerproject.org/job/Docker-PRs-s390x/10279/console is failing on #34988 / #35039;

17:03:05 FAIL: docker_api_swarm_test.go:359: DockerSwarmSuite.TestAPISwarmRaftQuorum
17:03:05 
17:03:05 [d7c1f9b6ad9b7] waiting for daemon to start
17:03:05 [d7c1f9b6ad9b7] daemon started
17:03:05 
17:03:05 [de70d7c6dc1b9] waiting for daemon to start
17:03:05 [de70d7c6dc1b9] daemon started
17:03:05 
17:03:05 [d6ae2c869805f] waiting for daemon to start
17:03:05 [d6ae2c869805f] daemon started
17:03:05 
17:03:05 [de70d7c6dc1b9] exiting daemon
17:03:05 [d6ae2c869805f] exiting daemon
17:03:05 docker_api_swarm_test.go:385:
17:03:05     // d1 will eventually step down from leader because there is no longer an active quorum, wait for that to happen
17:03:05     waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
17:03:05         _, err = cli.ServiceCreate(context.Background(), service.Spec, types.ServiceCreateOptions{})
17:03:05         return err.Error(), nil
17:03:05     }, checker.Contains, "Make sure more than half of the managers are online.")
17:03:05 docker_utils_test.go:435:
17:03:05     c.Assert(v, checker, args...)
17:03:05 ... obtained string = "Error response from daemon: rpc error: code = DeadlineExceeded desc = context deadline exceeded"
17:03:05 ... substring string = "Make sure more than half of the managers are online."
17:03:05 
17:03:05 [d7c1f9b6ad9b7] exiting daemon

@codecov
Copy link

codecov bot commented Jul 7, 2018

Codecov Report

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

@@            Coverage Diff            @@
##             master   #37390   +/-   ##
=========================================
  Coverage          ?   34.97%           
=========================================
  Files             ?      610           
  Lines             ?    44997           
  Branches          ?        0           
=========================================
  Hits              ?    15738           
  Misses            ?    27143           
  Partials          ?     2116

Copy link
Member

@yongtang yongtang 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

@boaz0 boaz0 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
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🌁

@vdemeester vdemeester merged commit c8bda42 into moby:master Jul 9, 2018
@thaJeztah thaJeztah deleted the update_cfssl_for_swarmkit branch July 9, 2018 07:13
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.

5 participants