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

ci: Fixes to build experimental QEMU with virtiofs #2737

Merged

Conversation

jcvenegas
Copy link
Member

@jcvenegas jcvenegas commented Jul 23, 2020

  • disable vmx-rdseed-exit: Needed to use qemu 5.0+ in azure VMs.
  • Install docker all the time, needed to build cached components in podman tests

Depends-on: github.com/kata-containers/packaging#1097
Depends-on: github.com/kata-containers/runtime#2840

Fixes: #2736

Signed-off-by: Jose Carlos Venegas Munoz [email protected]

@jcvenegas jcvenegas added the do-not-merge PR has problems or depends on another label Jul 23, 2020
jcvenegas added a commit to jcvenegas/runtime that referenced this pull request Jul 23, 2020
Update to qemu 5.0.x with support for virtiofs + dax.

Depends-on: github.com/kata-containers/packaging#1097
Depends-on: github.com/kata-containers/tests#2737

Fixes: kata-containers#2848

Signed-off-by: Jose Carlos Venegas Munoz <[email protected]>
@jcvenegas
Copy link
Member Author

/test-virtiofs

@jcvenegas
Copy link
Member Author

/test

jcvenegas added a commit to jcvenegas/kata-packaging that referenced this pull request Jul 23, 2020
Update build scripts for qemu-virtiofs

Depends-on: github.com/kata-containers/runtime#2840
Depends-on: github.com/kata-containers/tests#2737

Fixes: github.com/kata-containers/runtime#2848

Signed-off-by: Jose Carlos Venegas Munoz <[email protected]>
fi
fi
if [ "$CI" == true ] && [ "$(uname -m)" == "x86_64" ]; then
qemu_version="$(get_version "assets.hypervisor.qemu.version")"
Copy link
Member

Choose a reason for hiding this comment

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

@jcvenegas Is this just a placeholder change for testing CI for the change you are working on for virtiofs-qemu?
Because, here you are fetching version of qemu and not experimental/virtiofs qemu.

Copy link
Member Author

Choose a reason for hiding this comment

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

@amshinde fixed

@jcvenegas jcvenegas changed the title dnm: ci: disable vmx-rdseed-exit on experimental QEMU dnm: ci: Fixes to build experimental QEMU with virtiofs Aug 5, 2020
Experimental QEMU will be updated to qemu 5.0,
not needed to check for qemu version and disable in
all the time.

Depends-on: github.com/kata-containers/packaging#1097
Depends-on: github.com/kata-containers/runtime#2840

Fixes: kata-containers#2736

Signed-off-by: Jose Carlos Venegas Munoz <[email protected]>
@jcvenegas jcvenegas force-pushed the qemu-virtiofs-vmx-rdseed-exit branch 2 times, most recently from f4309c0 to c7545b3 Compare August 6, 2020 15:17
On upgrade for qemu 5.0 + virtiofs, the virtiofsd daemon
virtiofsd forks itself so, smem sees the process two times, the JSON
creation failed to build a valid JSON file because two times the number
of expected virtiofs values were added, this fix by calculating the PSS
usage of virtiofsd, this is the sum of the two virtiofsd process seen
by smem.

Signed-off-by: Jose Carlos Venegas Munoz <[email protected]>
@jcvenegas jcvenegas force-pushed the qemu-virtiofs-vmx-rdseed-exit branch from ed3558e to 0f26e2f Compare August 10, 2020 18:13
jcvenegas added a commit to jcvenegas/runtime that referenced this pull request Aug 11, 2020
Update to qemu 5.0.x with support for virtiofs + dax.

Depends-on: github.com/kata-containers/packaging#1097
Depends-on: github.com/kata-containers/tests#2737

Fixes: kata-containers#2848

Signed-off-by: Jose Carlos Venegas Munoz <[email protected]>
jcvenegas added a commit to jcvenegas/kata-packaging that referenced this pull request Aug 12, 2020
Update build scripts for qemu-virtiofs

Depends-on: github.com/kata-containers/runtime#2840
Depends-on: github.com/kata-containers/tests#2737

Fixes: github.com/kata-containers/runtime#2848

Signed-off-by: Jose Carlos Venegas Munoz <[email protected]>
jcvenegas added a commit to jcvenegas/kata-packaging that referenced this pull request Aug 12, 2020
Update build scripts for qemu-virtiofs

Depends-on: github.com/kata-containers/runtime#2840
Depends-on: github.com/kata-containers/tests#2737

Fixes: github.com/kata-containers/runtime#2848

Signed-off-by: Jose Carlos Venegas Munoz <[email protected]>
jcvenegas added a commit to jcvenegas/kata-packaging that referenced this pull request Aug 12, 2020
Update build scripts for qemu-virtiofs.

- virtiofs-0.3 patches are not needed
- Sync build on how vanilla qemu is built
- Apply patches for virtiofsd if any (none today)
- Apply patches that are used for the qemu vanilla
- Apply patches in order

Depends-on: github.com/kata-containers/runtime#2840
Depends-on: github.com/kata-containers/tests#2737

Fixes: github.com/kata-containers/runtime#2848

Signed-off-by: Jose Carlos Venegas Munoz <[email protected]>
@jcvenegas
Copy link
Member Author

/test

1 similar comment
@jcvenegas
Copy link
Member Author

/test

@likebreath
Copy link
Contributor

This PR is required as the dependent PR of kata-containers/runtime#2840. PTAL. @amshinde @GabyCT

@jcvenegas I assume there is no blockers to merge this PR. Please correct me if I am wrong.

@jcvenegas jcvenegas changed the title dnm: ci: Fixes to build experimental QEMU with virtiofs ci: Fixes to build experimental QEMU with virtiofs Aug 14, 2020
@jcvenegas jcvenegas removed the do-not-merge PR has problems or depends on another label Aug 14, 2020
@jcvenegas
Copy link
Member Author

@likebreath yes, this should be merged now that the other PR was merge, this needs some ack to get it merged

# memory of virtiofsd.
# It is a special case of get_pss_memory,
# virtiofsd forks itself so, smem sees the process
# two times, this function sum both pss values:
Copy link
Contributor

Choose a reason for hiding this comment

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

s/sum/sums

@likebreath likebreath merged commit 64a96c8 into kata-containers:master Aug 14, 2020
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.

Enable qemu-virtiofs 5.0 on CI
4 participants