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

CI: Move from qemu 2.7 to qemu 2.11 #182

Merged
merged 1 commit into from
Mar 28, 2018

Conversation

chavafg
Copy link
Contributor

@chavafg chavafg commented Mar 27, 2018

Instead of using a custom version of qemu, we should
use qemu version from upstream.

Fixes #163.

Signed-off-by: Salvador Fuentes salvador.fuentes@intel.com


echo "Build Qemu"
./configure.sh
make
Copy link

Choose a reason for hiding this comment

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

make -j $(nproc)

@chavafg chavafg force-pushed the topic/qemu2-11 branch 5 times, most recently from 6ed9d0c to 712e866 Compare March 27, 2018 21:47
# qemu under /usr/bin/, create a symlink.
# this should be solved when we define and have the packages
# in a repository.
sudo ln -sf $(command -v qemu-system-x86_64) /usr/bin/
Copy link
Contributor

Choose a reason for hiding this comment

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

Hard-coded architecture.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

git checkout "$KATA_QEMU_BRANCH"

echo "Build Qemu"
./configure.sh
Copy link
Contributor

Choose a reason for hiding this comment

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

I see that we have an old version of the configuration script in the qemu branch.

But as noted in kata-containers/linux#5 (comment), we should be using the script from the packaging repo, which will be:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Opened kata-containers/packaging#10 to address this.

@sboeuf
Copy link

sboeuf commented Mar 28, 2018

@chavafg kata-containers/packaging#10 has been merged, please modify this PR accordingly.

@sboeuf
Copy link

sboeuf commented Mar 28, 2018

@jcvenegas @grahamwhaley @jodh-intel Please review the PR as it now relies on latest script from kata-containers/packaging/pull/10
And let's merge this so that we can officially switch our CI to Qemu 2.11 😃


echo "Build Qemu"
# Patch to not fail on --disable-static
curl https://raw.githubusercontent.com/clearcontainers/packaging/master/qemu-lite/configure.patch | patch -p1
Copy link

Choose a reason for hiding this comment

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

unknown/unsupported options should not be ignored, using https://github.com/kata-containers/qemu/blob/stable-2.11/configure.sh this patch is not needed

Copy link
Contributor Author

@chavafg chavafg Mar 28, 2018

Choose a reason for hiding this comment

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

@devimc we have agreed to use github.com/qemu/qemu instead of the kata-containers/qemu repo and use https://github.com/kata-containers/packaging/blob/master/scripts/configure-hypervisor.sh as the configurion options.
I have opened kata-containers/packaging#12 to fix this, then I can remove the patch here.

@jcvenegas
Copy link
Member

@chavafg could you try to address @jodh-intel comment ?

Instead of using a custom version of qemu, we should
use qemu version from upstream.

Fixes kata-containers#163.

Depends-on: github.com/kata-containers/runtime#119

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
@devimc
Copy link

devimc commented Mar 28, 2018

lgtm

@jcvenegas
Copy link
Member

jcvenegas commented Mar 28, 2018

lgtm

Approved with PullApprove

@devimc devimc merged commit dd99f5a into kata-containers:master Mar 28, 2018
git checkout "$KATA_QEMU_BRANCH"

echo "Build Qemu"
eval "./${QEMU_CONFIG_SCRIPT}" "qemu" | xargs ./configure
Copy link
Contributor

Choose a reason for hiding this comment

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

Cute! 😄

@jodh-intel
Copy link
Contributor

jodh-intel commented Apr 3, 2018

fwiw,

lgtm ;)

Approved with PullApprove

@chavafg chavafg deleted the topic/qemu2-11 branch May 31, 2018 15:21
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