Skip to content
This repository was archived by the owner on Jun 28, 2024. It is now read-only.

ci: fix install_runtime.sh and add support for using acrn config file#1793

Merged
amshinde merged 2 commits intokata-containers:masterfrom
chavafg:topic/fix-runtime-install
Jul 10, 2019
Merged

ci: fix install_runtime.sh and add support for using acrn config file#1793
amshinde merged 2 commits intokata-containers:masterfrom
chavafg:topic/fix-runtime-install

Conversation

@chavafg
Copy link
Copy Markdown
Contributor

@chavafg chavafg commented Jul 10, 2019

Once kata-containers/runtime#1779 is merged, we will be able
to run CI using acrn hypervisor. Add support for running kata
with acrn using its dedicated configuration file.

In addition, kata-runtime kata-check will fail if the hypervisor
in the kata runtime config file is not found, so run kata-check
after correct config file is in place.

chavafg added 2 commits July 9, 2019 19:30
`kata-runtime kata-check` will fail if the hypervisor
in the kata runtime config file is not found.

Fixes: kata-containers#1792.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
Once kata-containers/runtime#1779 is merged, we will be able
to run CI using acrn hypervisor. Add support for running kata
with acrn using its dedicated configuration file.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
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

@chavafg
Copy link
Copy Markdown
Contributor Author

chavafg commented Jul 10, 2019

/tes

@grahamwhaley
Copy link
Copy Markdown
Contributor

/test
;-)

@chavafg
Copy link
Copy Markdown
Contributor Author

chavafg commented Jul 10, 2019

ouch, thanks @grahamwhaley

Copy link
Copy Markdown

@jodh-intel jodh-intel left a comment

Choose a reason for hiding this comment

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

lgtm

For the future: I do wonder if it would be better to handle this with a case now though, or change the logic to add an else and error if we find something unexpected (KATA_HYPERVISOR="funky_new_hypervisor")?

@amshinde
Copy link
Copy Markdown
Member

Rerunning failing fedora and vsocks CI.

vijaydhanraj added a commit to vijaydhanraj/runtime that referenced this pull request Jul 10, 2019
ACRN hypervisor is a type-1 hypervisor and this patch
adds support to check and validate if the system is
capable of running kata containers with ACRN hypervisor.

Depends-on: github.com/kata-containers/tests#1793

v3->v4:
Implemented a generic way to identify hypervisor and
test VM creation.

v2->v3:
1. Removed cgo structs and defined go structs.
2. Suppressed lint warnings due to unused createVM struct.

v1->v2:
1. Created an issue kata-containers#1784 to address TODO item.
2. Fixed formatting of the log message.
3. Currently ACRN is only supported on amd64. So
   moved ACRN specific code to kata-check_amd64.go.

Fixes: kata-containers#1778

Signed-off-by: Vijay Dhanraj <vijay.dhanraj@intel.com>
@amshinde amshinde merged commit cc6ec05 into kata-containers:master Jul 10, 2019
@chavafg chavafg deleted the topic/fix-runtime-install branch July 23, 2019 16:59
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.

5 participants