Skip to content

Bump docker/distribution to 83389a148052d74ac602f5f1d62f86ff2f3c4aa5#36906

Merged
vdemeester merged 1 commit intomoby:masterfrom
novas0x2a:bump-distribution
May 3, 2018
Merged

Bump docker/distribution to 83389a148052d74ac602f5f1d62f86ff2f3c4aa5#36906
vdemeester merged 1 commit intomoby:masterfrom
novas0x2a:bump-distribution

Conversation

@novas0x2a
Copy link
Copy Markdown
Contributor

@novas0x2a novas0x2a commented Apr 20, 2018

vendored distribution is quite old, and current distribution contains an
API break, which means it's not possible to vendor a bugfixed
distribution and docker/docker master at the same time.

Note: locally, TestTarUntarWithXattr fails for me in both this branch and the current master; I'm not sure what's happening, but I don't think it's related to this PR. (I'm hoping the CI tests will pass).

- What I did

Bumped docker/distribution and made the minor changes necessary to deal with that.

- How I did it

Typing frantically until it was done.

- How to verify it

In theory this should be pretty low-impact, since docker/moby doesn't actually use a lot of the distribution package. I'd expect that if it compiles and passes tests, it'd probably work.

- Description for the changelog
Updated vendored copy of docker/distribution to ease projects trying to vendor both moby/moby (docker/docker) and docker/distribution.

- A picture of a cute animal (not mandatory but encouraged)

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 20, 2018

Codecov Report

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

@@            Coverage Diff            @@
##             master   #36906   +/-   ##
=========================================
  Coverage          ?   35.35%           
=========================================
  Files             ?      614           
  Lines             ?    45701           
  Branches          ?        0           
=========================================
  Hits              ?    16159           
  Misses            ?    27400           
  Partials          ?     2142

@novas0x2a
Copy link
Copy Markdown
Contributor Author

Some of the jenkins builds failed, but it doesn't look like the failures had anything to do with my changes. Can you retrigger?

@thaJeztah
Copy link
Copy Markdown
Member

hm, looks like I don't have an option / permissions to restart the vendor CI; can you try force-pushing your branch to trigger CI?

@thaJeztah
Copy link
Copy Markdown
Member

Full diff is distribution/distribution@edc3ab2...83389a1

vendored distribution is quite old, and current distribution contains an
API break, which means it's not possible to vendor a bugfixed
distribution and a docker/docker at the same time.

Signed-off-by: Mike Lundy <[email protected]>
@novas0x2a
Copy link
Copy Markdown
Contributor Author

Looks like mostly green this time; presumably (from their names) experimental and janky aren't expected to pass?

@thaJeztah
Copy link
Copy Markdown
Member

Failure on both Janky and Experimental is;

17:11:53 === RUN   TestServicePlugin
17:12:54 --- FAIL: TestServicePlugin (61.17s)
17:12:54 	daemon.go:285: [de1ede6a26f30] waiting for daemon to start
17:12:54 	daemon.go:317: [de1ede6a26f30] daemon started
17:12:54 	daemon.go:275: [de1ede6a26f30] exiting daemon
17:12:54 	daemon.go:285: [da00189ca671c] waiting for daemon to start
17:12:54 	daemon.go:317: [da00189ca671c] daemon started
17:12:54 	daemon.go:285: [d45b84e7c3eb8] waiting for daemon to start
17:12:54 	daemon.go:317: [d45b84e7c3eb8] daemon started
17:12:54 	daemon.go:285: [df983116822dc] waiting for daemon to start
17:12:54 	daemon.go:317: [df983116822dc] daemon started
17:12:54 	plugin_test.go:104: timeout hit after 30s: plugin %!q(MISSING) exists
17:12:54 	daemon.go:275: [df983116822dc] exiting daemon
17:12:54 	daemon.go:275: [d45b84e7c3eb8] exiting daemon
17:12:54 	daemon.go:275: [da00189ca671c] exiting daemon
17:12:54 FAIL

could be a flaky test, or something introduced recently; restarting CI on those, let's see if it's flaky or not

@novas0x2a
Copy link
Copy Markdown
Contributor Author

Heyyyy all green now

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

ping @dmcgowan @cpuguy83

@stevvooe
Copy link
Copy Markdown
Contributor

stevvooe commented May 3, 2018

LGTM

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

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