Skip to content

Fix bundle dir for integration-cli#29121

Merged
dnephin merged 1 commit intomoby:masterfrom
AkihiroSuda:fix-it-bundle
Dec 5, 2016
Merged

Fix bundle dir for integration-cli#29121
dnephin merged 1 commit intomoby:masterfrom
AkihiroSuda:fix-it-bundle

Conversation

@AkihiroSuda
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda commented Dec 5, 2016 •
edited
Loading

- What I did
test.main was unexpectedly created under docker/integration-cli/bundles/$VERSION/test-integration-cli directory.
This commit moves test.main to docker/bundles/$VERSION/test-integration-cli.

"cherry-pick" https://github.com/docker/docker/pull/26684/files#r79300354

- How I did it
See above

- How to verify it

$ make shell
root@c9bc09cc4e3e:/go/src/github.com/docker/docker# hack/make.sh build-integration-test-binary dynbinary test-integration-cli
root@c9bc09cc4e3e:/go/src/github.com/docker/docker# ls integration-cli/bundles
ls: cannot access integration-cli/bundles: No such file or directory
root@c9bc09cc4e3e:/go/src/github.com/docker/docker# ls bundles/latest/test-integration-cli/test.main 
bundles/latest/test-integration-cli/test.main

- Description for the changelog

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

Signed-off-by: Akihiro Suda suda.akihiro@lab.ntt.co.jp

@AkihiroSuda
Fix bundle dir for integration-cli
4522f14 
test.main was unexpectedly created under docker/integration-cli/bundles/VERSION/test-integration-cli directory.
This commit moves test.main to docker/bundles/VERSION/test-integration-cli.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
vdemeester
vdemeester approved these changes Dec 5, 2016
View reviewed changes
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 🐸
/cc @dnephin

dnephin
dnephin approved these changes Dec 5, 2016
View reviewed changes
Copy link
Copy Markdown
Member

@dnephin dnephin left a comment

Choose a reason for hiding this comment

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

LGTM

@dnephin dnephin merged commit 86faf13 into moby:master Dec 5, 2016
@GordonTheTurtle GordonTheTurtle added this to the 1.14.0 milestone Dec 5, 2016
@AkihiroSuda AkihiroSuda mentioned this pull request Feb 2, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@vdemeester vdemeester vdemeester approved these changes

@dnephin dnephin dnephin approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

status/2-code-review

Projects

None yet

Milestone

17.04.0

Development

Successfully merging this pull request may close these issues.

4 participants

@AkihiroSuda @vdemeester @dnephin @GordonTheTurtle