Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add pkg procps to virt-launcher #510

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions images/virt-launcher/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import:
before: install
includePaths:
- edk2-ovmf-20231115-alt1.noarch.rpm
- edk2-ovmf-20240811-alt2.noarch.rpm

# After install stage.
# Add libxcrypto library.
Expand Down Expand Up @@ -103,23 +104,29 @@ shell:
apt-get update && apt-get install --yes \
acl \
pcre \
procps \
ethtool \
nftables \
xorriso \
passt \
seabios \
libffi8 \
swtpm-tools \
libvirt-client==10.2.0-alt1 \
libvirt-daemon-driver-qemu==10.2.0-alt1 \
qemu-kvm-core==9.0.2-alt2
libvirt-client \
libvirt-daemon-driver-qemu \
qemu-kvm-core
- apt-get clean
- rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
install:
# Upgrade edk2-ovmf package to custom build and remove its package.
- |
rpm -Uv /edk2-ovmf-20231115-alt1.noarch.rpm
rm /edk2-ovmf-20231115-alt1.noarch.rpm
echo "rpm -Uv /edk2-ovmf.noarch.rpm"
# rpm -Uv /edk2-ovmf-20231115-alt1.noarch.rpm
# rm /edk2-ovmf-20231115-alt1.noarch.rpm
# rpm -Uv /edk2-ovmf-20231115-alt1.noarch.rpm
# rm /edk2-ovmf-20231115-alt1.noarch.rpm
rpm -Uv /edk2-ovmf-20240811-alt2.noarch.rpm
rm /edk2-ovmf-20240811-alt2.noarch.rpm
# Restructure firware files in /usr/share/OVMF to mimic structure
# in edk2-ovmf package from the original kubevirt.
- |
Expand All @@ -137,10 +144,10 @@ shell:
rm OVMF_VARS.secboot.fd
mv OVMF_VARS_4M.fd OVMF_VARS.fd
rm OVMF_VARS_4M.ms.fd
rm OVMF_VARS_4M.ms.qcow2
rm OVMF_VARS_4M.qcow2
rm OVMF_VARS_4M.ms.qcow2 || true
rm OVMF_VARS_4M.qcow2 || true
mv OVMF_VARS_4M.secboot.fd OVMF_VARS.secboot.fd
rm OVMF_VARS_4M.secboot.qcow2
rm OVMF_VARS_4M.secboot.qcow2 || true
ls -la
setup:
# Replace virt-launcher-monitor with the wrapper.
Expand Down Expand Up @@ -267,6 +274,7 @@ shell:
zlib-devel
- apt-get clean
- rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
- echo "Done"

install:
# AltLinux requires building packages by non-root users.
Expand All @@ -289,3 +297,5 @@ shell:
echo "Build RPMs from:" /home/builder/*.rpm
echo "Note: time consuming operation, be patient ..."
su - builder -c 'trap "echo Build log tail: ; tail -n 1024 /tmp/build.log" EXIT ; rpm -ba /home/builder/RPM/SPECS/edk2.spec > /tmp/build.log 2>&1'
echo "Done"
ls -la
Loading