Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change emptyfs path in integration-cli tests #10716

Merged
merged 1 commit into from Feb 12, 2015
Merged

Change emptyfs path in integration-cli tests #10716

merged 1 commit into from Feb 12, 2015

Conversation

@ahmetb
Copy link
Contributor

@ahmetb ahmetb commented Feb 11, 2015

This fixes the build break in Jenkins Windows CI tests and
fixes TestInspectImage for Windows CLI.

Since mktemp -d doesn't come with MSYSGIT, this was breaking
the Jenkins build for a while now.

Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com
Label: #windows
cc: @tianon @jfrazelle @unclejack @tiborvass @sachin-jayant-joshi

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Feb 11, 2015

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Feb 11, 2015

oh sorry thats my bad hangon

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Feb 11, 2015

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Feb 11, 2015

LGTM

@ahmetb
Copy link
Contributor Author

@ahmetb ahmetb commented Feb 11, 2015

@jfrazelle ok I can perfectly see somebody has broken the windows build again recently. :) 👍 okayface

@tianon
Copy link
Member

@tianon tianon commented Feb 12, 2015

LGTM ❤️

@tianon
Copy link
Member

@tianon tianon commented Feb 12, 2015

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

@tianon tianon Feb 12, 2015

Oh man, I just realized this should be DEST, not DIST.

Copy link
Member

@tianon tianon Feb 12, 2015

In other words, we just created /emptyfs on the Windows Jenkins box. 👼

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Feb 12, 2015

LGTM

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Feb 12, 2015

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>
@tianon
Copy link
Member

@tianon tianon commented Feb 12, 2015

LGTM

@jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Feb 12, 2015

LGTM after "janky" passes

@tianon
Copy link
Member

@tianon tianon commented Feb 12, 2015

💚

tianon added a commit that referenced this issue Feb 12, 2015
Change emptyfs path in integration-cli tests
@tianon tianon merged commit 65623e2 into moby:master Feb 12, 2015
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants