Change emptyfs path in integration-cli tests #10716
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I ran your PR here https://jenkins.dockerproject.com/job/Windows-PRs/1/console |
|
oh sorry thats my bad hangon |
|
LGTM |
|
@jfrazelle ok I can perfectly see somebody has broken the windows build again recently. :) 👍 okayface |
|
LGTM ❤️ |
jessfraz
added
platform/windows
status/2-code-review
and removed
status/0-triage
labels
|
The part this is changing/fixing worked fine in Jenkins! 👍 |
| @@ -5,7 +5,8 @@ if ! docker inspect emptyfs &> /dev/null; then | |||
| # let's build a "docker save" tarball for "emptyfs" | |||
| # see https://github.com/docker/docker/pull/5262 | |||
| # and also https://github.com/docker/docker/issues/4242 | |||
| dir="$(mktemp -d)" | |||
| dir="$DIST/emptyfs" | |||
There was a problem hiding this comment.
Oh man, I just realized this should be DEST, not DIST.
There was a problem hiding this comment.
In other words, we just created /emptyfs on the Windows Jenkins box. 👼
|
LGTM |
|
op nice find |
This fixes the build break in Jenkins Windows CI tests and fixes TestInspectImage for Windows CLI. Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
|
LGTM |
|
LGTM after "janky" passes |
|
💚 |
tianon
added a commit
that referenced
this pull request
Feb 12, 2015
Change emptyfs path in integration-cli tests
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes the build break in Jenkins Windows CI tests and
fixes TestInspectImage for Windows CLI.
Since
mktemp -ddoesn't come with MSYSGIT, this was breakingthe Jenkins build for a while now.
Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com
Label:
#windowscc: @tianon @jfrazelle @unclejack @tiborvass @sachin-jayant-joshi