cli: Error out if initrd/rootfs not define in config file #588

nitkon · 2018-08-16T13:46:08Z

If neither initrd nor rootfs path is mentioned in
the configuration.toml file, then error out stating
the same

Fixes: #587

Signed-off-by: Nitesh Konkar [email protected]

grahamwhaley

lgtm
nice find :-)
I look forward to a healthy English debate on the use of 'nor' vs 'or' here ;-)

katacontainersbot · 2018-08-16T13:57:03Z

PSS Measurement:
Qemu: 169222 KB
Proxy: 4099 KB
Shim: 8882 KB

Memory inside container:
Total Memory: 2043464 KB
Free Memory: 2003456 KB

devimc

lgtm

jodh-intel · 2018-08-16T14:40:24Z

lgtm

opendev-zuul · 2018-08-16T15:08:32Z

Build succeeded (third-party-check pipeline).

kata-runsh : SUCCESS in 55m 01s

amshinde · 2018-08-16T18:58:06Z

@nitkon TestMinimalRuntimeConfig test is failing. Can you take a look.

egernst · 2018-08-17T22:16:29Z

I agree with Graham. I think you have a double negative; s/nor/or?

egernst · 2018-08-17T22:16:29Z

I agree with Garham. I think you have a double negative; s/nor/or?

WeiZhang555 · 2018-08-20T02:40:06Z

Oh my god, why not make life easier?

"either image or initrd must be specified in configuration file"

I can't understand your error message as a non-native English speaker 😢

jodh-intel · 2018-08-20T08:00:42Z

Agreed - could you update please @nitkon?

nitkon · 2018-08-20T08:03:05Z

@jodh-intel : Sure.

nitkon · 2018-08-21T05:14:03Z

@jodh-intel : Done.

katacontainersbot · 2018-08-21T05:26:13Z

PSS Measurement:
Qemu: 169179 KB
Proxy: 4103 KB
Shim: 9048 KB

Memory inside container:
Total Memory: 2043464 KB
Free Memory: 2003564 KB

opendev-zuul · 2018-08-21T06:14:44Z

Build succeeded (third-party-check pipeline).

kata-runsh : SUCCESS in 1h 00m 53s

devimc · 2018-08-21T14:34:08Z

@nitkon please fix the unit tests

--- FAIL: TestMinimalRuntimeConfig (0.00s)
	config_test.go:587: /tmp/kata-runtime-831458654/minimal-runtime-config-003076135/runtime.toml: either image or initrd must be defined in the configuration file

opendev-zuul · 2018-08-24T07:02:17Z

Build failed (third-party-check pipeline) integration testing with
OpenStack. For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

kata-runsh : FAILURE in 38m 59s

jodh-intel · 2018-08-24T08:11:44Z

Tests still failing...

nitkon · 2018-08-24T08:23:22Z

@jodh-intel : Yes realized that. I am unsure about how do I overcome it. If I return initrd other test cases fail and If I do not set initrd or rootfs, it errors out as expected but test case fails as config and expectedConfig don't match.

katacontainersbot · 2018-08-24T08:32:34Z

PSS Measurement:
Qemu: 169477 KB
Proxy: 4210 KB
Shim: 8806 KB

Memory inside container:
Total Memory: 2043464 KB
Free Memory: 2003448 KB

opendev-zuul · 2018-08-24T09:09:51Z

Build failed (third-party-check pipeline) integration testing with
OpenStack. For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

kata-runsh : FAILURE in 33m 57s

jodh-intel · 2018-08-28T14:53:29Z

Hi @nitkon - I've got to look at that part of the tests to fix the cyclomatic complexity CI failure on #639 if you want to wait on that landing first?

jodh-intel · 2018-09-11T08:51:52Z

Hi @nitkon - could you re-push? The CI logs seems to have expired :)

katacontainersbot · 2018-09-11T11:06:15Z

PSS Measurement:
Qemu: 169991 KB
Proxy: 4016 KB
Shim: 8706 KB

Memory inside container:
Total Memory: 2043460 KB
Free Memory: 2003432 KB

opendev-zuul · 2018-09-11T11:13:52Z

Build failed (third-party-check pipeline) integration testing with
OpenStack. For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

kata-runsh : RETRY_LIMIT in 8m 33s

sboeuf · 2018-09-11T16:39:35Z

@nitkon please rebase and repush, the CI should pass, and I'll merge once this happens!

amshinde · 2018-09-11T19:21:59Z

@nitkon Looks like you need to fix this failing test as well:

--- FAIL: TestMinimalRuntimeConfigWithVsock (0.00s)
	config_test.go:667: /tmp/kata-runtime-963320441/minimal-runtime-config-600452101/runtime.toml: either image or initrd must be defined in the configuration file

opendev-zuul · 2018-09-11T19:58:22Z

Build failed (third-party-check pipeline) integration testing with
OpenStack. For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

kata-runsh : RETRY_LIMIT in 12m 57s

katacontainersbot · 2018-09-13T10:06:40Z

PSS Measurement:
Qemu: 169967 KB
Proxy: 4165 KB
Shim: 8757 KB

Memory inside container:
Total Memory: 2043460 KB
Free Memory: 2003068 KB

jodh-intel · 2018-09-13T10:23:45Z

Ah - good catch @nitkon! I think you can merge the commits though as otherwise the previous commit will fail the tests.

opendev-zuul · 2018-09-13T10:45:57Z

Build failed (third-party-check pipeline) integration testing with
OpenStack. For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

kata-runsh : RETRY_LIMIT in 4m 36s

katacontainersbot · 2018-09-13T10:50:28Z

PSS Measurement:
Qemu: 172287 KB
Proxy: 4232 KB
Shim: 9044 KB

Memory inside container:
Total Memory: 2043460 KB
Free Memory: 2003076 KB

nitkon · 2018-09-13T11:56:44Z

@jodh-intel : Thanks for the input! 😃 Updated my PR. Couple of failures I guess not related to my PR. Re-push?

jodh-intel · 2018-09-13T13:22:07Z

Hi @nitkon - yep - this error seems unrelated.

@grahamwhaley, @chavafg - the error though is similar to #727 (comment):

Openshift started successfully
1..1
not ok 1 Hello Openshift using Kata Containers
# (in test file hello_world.bats, line 28)
#   `sudo -E oc create -f "${BATS_TEST_DIRNAME}/data/hello-pod-kata.json"' failed
# fedora-27-1019.vexxhost.net   Ready     <none>    14s       v1.10.0+b81c8f8
# W0913 11:28:46.267162   29782 util_unix.go:75] Using "/var/run/crio/crio.sock" as endpoint is deprecated, please consider using full url format "unix:///var/run/crio/crio.sock".
# Image is update to date for docker.io/openshift/hello-openshift@sha256:aaea76ff622d2f8bcb32e538e7b3cd0ef6d291953f3e7c9f556c1ba5baf47e2e
# Error from server (Forbidden): error when creating "/tmp/jenkins/workspace/kata-containers-runtime-fedora-27-PR/go/src/github.com/kata-containers/tests/integration/openshift/data/hello-pod-kata.json": pods "hello-openshift" is forbidden: error looking up service account default/default: serviceaccount "default" not found
# Error from server (NotFound): pods "hello-openshift" not found
# rm: cannot remove '': No such file or directory
# Error from server (NotFound): pods "hello-openshift" not found

katacontainersbot · 2018-09-13T13:47:47Z

PSS Measurement:
Qemu: 166192 KB
Proxy: 4090 KB
Shim: 8823 KB

Memory inside container:
Total Memory: 2043460 KB
Free Memory: 2003564 KB

opendev-zuul · 2018-09-13T14:37:20Z

Build succeeded (third-party-check pipeline).

kata-runsh : SUCCESS in 59m 09s

If neither initrd nor rootfs path is mentioned in the configuration.toml file, then error out stating the same Fixes: kata-containers#587 Signed-off-by: Nitesh Konkar [email protected]

katacontainersbot · 2018-09-13T14:52:20Z

PSS Measurement:
Qemu: 167904 KB
Proxy: 4165 KB
Shim: 8753 KB

Memory inside container:
Total Memory: 2043460 KB
Free Memory: 2006852 KB

codecov · 2018-09-13T14:52:37Z

Codecov Report

Merging #588 into master will decrease coverage by 0.01%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master     #588      +/-   ##
==========================================
- Coverage   65.25%   65.23%   -0.02%     
==========================================
  Files          85       85              
  Lines        9960     9959       -1     
==========================================
- Hits         6499     6497       -2     
  Misses       2809     2809              
- Partials      652      653       +1

opendev-zuul · 2018-09-13T15:45:55Z

Build succeeded (third-party-check pipeline).

kata-runsh : SUCCESS in 1h 00m 15s

caoruidong · 2018-09-13T16:19:39Z

Since we have lots of approvals and All CI pass, merge this.

vendor: update dependency opencontainers/runc

grahamwhaley approved these changes Aug 16, 2018

View reviewed changes

devimc approved these changes Aug 16, 2018

View reviewed changes

amshinde approved these changes Aug 16, 2018

View reviewed changes

nitkon force-pushed the master branch from 22cb919 to 3113ad8 Compare August 21, 2018 05:13

nitkon force-pushed the master branch from 73dbef4 to 3113ad8 Compare August 24, 2018 08:11

nitkon force-pushed the master branch from 3113ad8 to 79f5d89 Compare September 11, 2018 10:46

sboeuf approved these changes Sep 11, 2018

View reviewed changes

nitkon force-pushed the master branch from 79f5d89 to 4555bfe Compare September 11, 2018 18:27

sboeuf added the enhancement Improvement to an existing feature label Sep 12, 2018

nitkon force-pushed the master branch from 6c128ee to e240e56 Compare September 13, 2018 10:30

nitkon force-pushed the master branch from e240e56 to 3f9415c Compare September 13, 2018 13:37

cli: Error out if initrd/rootfs not define in config file

bce6859

If neither initrd nor rootfs path is mentioned in the configuration.toml file, then error out stating the same Fixes: kata-containers#587 Signed-off-by: Nitesh Konkar [email protected]

nitkon force-pushed the master branch from 3f9415c to bce6859 Compare September 13, 2018 14:44

caoruidong merged commit 22aedc4 into kata-containers:master Sep 13, 2018

egernst pushed a commit to egernst/runtime that referenced this pull request Feb 9, 2021

Merge pull request kata-containers#588 from odinuge/dep/runc

2948e1a

vendor: update dependency opencontainers/runc

cli: Error out if initrd/rootfs not define in config file #588

cli: Error out if initrd/rootfs not define in config file #588

Conversation

nitkon commented Aug 16, 2018

grahamwhaley left a comment

Choose a reason for hiding this comment

katacontainersbot commented Aug 16, 2018

devimc left a comment

Choose a reason for hiding this comment

jodh-intel commented Aug 16, 2018 • edited by amshinde Loading

opendev-zuul bot commented Aug 16, 2018

amshinde commented Aug 16, 2018

egernst commented Aug 17, 2018

egernst commented Aug 17, 2018

WeiZhang555 commented Aug 20, 2018 • edited Loading

jodh-intel commented Aug 20, 2018

nitkon commented Aug 20, 2018

nitkon commented Aug 21, 2018

katacontainersbot commented Aug 21, 2018

opendev-zuul bot commented Aug 21, 2018

devimc commented Aug 21, 2018

opendev-zuul bot commented Aug 24, 2018

jodh-intel commented Aug 24, 2018

nitkon commented Aug 24, 2018

katacontainersbot commented Aug 24, 2018

opendev-zuul bot commented Aug 24, 2018

jodh-intel commented Aug 28, 2018

jodh-intel commented Sep 11, 2018

katacontainersbot commented Sep 11, 2018

opendev-zuul bot commented Sep 11, 2018

sboeuf commented Sep 11, 2018

amshinde commented Sep 11, 2018

opendev-zuul bot commented Sep 11, 2018

katacontainersbot commented Sep 13, 2018

jodh-intel commented Sep 13, 2018

opendev-zuul bot commented Sep 13, 2018

katacontainersbot commented Sep 13, 2018

nitkon commented Sep 13, 2018

jodh-intel commented Sep 13, 2018

katacontainersbot commented Sep 13, 2018

opendev-zuul bot commented Sep 13, 2018

katacontainersbot commented Sep 13, 2018

codecov bot commented Sep 13, 2018 • edited Loading

Codecov Report

opendev-zuul bot commented Sep 13, 2018

caoruidong commented Sep 13, 2018

jodh-intel commented Aug 16, 2018 •

edited by amshinde

Loading

WeiZhang555 commented Aug 20, 2018 •

edited

Loading

codecov bot commented Sep 13, 2018 •

edited

Loading