Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

create/run: Make bundle path default to cwd#838

Merged
grahamwhaley merged 2 commits into
kata-containers:stable-1.3from
jodh-intel:stable-1.3-fix-default-bundle-path
Nov 22, 2018
Merged

create/run: Make bundle path default to cwd#838
grahamwhaley merged 2 commits into
kata-containers:stable-1.3from
jodh-intel:stable-1.3-fix-default-bundle-path

Conversation

@jodh-intel
Copy link
Copy Markdown

The bundle path was documented as defaulting to the current directory
but was not being set to that value if not explicitly specified.

Also moved factory creation code to a new handleFactory() function to
avoid cyclomatic complexity issues.

Fixes #821.

(cherry picked from commit 8831245)

Signed-off-by: James O. D. Hunt james.o.hunt@intel.com

@devimc
Copy link
Copy Markdown

devimc commented Oct 18, 2018

/test

1 similar comment
@WeiZhang555
Copy link
Copy Markdown
Member

WeiZhang555 commented Oct 23, 2018

/test

@caoruidong
Copy link
Copy Markdown
Member

/retest

@jodh-intel jodh-intel force-pushed the stable-1.3-fix-default-bundle-path branch from bd30104 to 4b1dbff Compare October 24, 2018 16:38
@jodh-intel
Copy link
Copy Markdown
Author

/test

@jodh-intel
Copy link
Copy Markdown
Author

Blocked on kata-containers/tests#856.

@sboeuf
Copy link
Copy Markdown

sboeuf commented Oct 30, 2018

@jodh-intel kata-containers/tests#856 has been merged, do you think the CI should pass now for this PR?

Nevermind, I've just read #836 (comment)

@sboeuf
Copy link
Copy Markdown

sboeuf commented Nov 5, 2018

@jodh-intel any progress on that?

James O. D. Hunt added 2 commits November 22, 2018 14:24
Re-ordered a couple of structs (moved `sync.WaitGroup` fields) to keep
the `maligned` linter happy. Previously:

``
virtcontainers/pkg/mock/cc_proxy_mock.go:24:18:warning: struct of size 160 could be 152 (maligned)
virtcontainers/monitor.go:15:14:warning: struct of size 80 could be 72 (maligned)
```

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
(cherry picked from part of commit 526d55b)
The bundle path was documented as defaulting to the current directory
but was not being set to that value if not explicitly specified.

Also moved factory creation code to a new `handleFactory()` function to
avoid cyclomatic complexity issues.

Fixes kata-containers#821.

(cherry picked from commit 8831245)

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
@jodh-intel jodh-intel force-pushed the stable-1.3-fix-default-bundle-path branch from 4b1dbff to dbd78da Compare November 22, 2018 14:24
@jodh-intel
Copy link
Copy Markdown
Author

Ping - would be good to get this landed at long last ;)

Copy link
Copy Markdown
Contributor

@grahamwhaley grahamwhaley left a comment

Choose a reason for hiding this comment

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

lgtm

@grahamwhaley grahamwhaley merged commit a909b66 into kata-containers:stable-1.3 Nov 22, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants