Skip to content

Commit

Permalink
ci: Workaround virtiofs
Browse files Browse the repository at this point in the history
  • Loading branch information
cgwalters committed Sep 10, 2023
1 parent dd96121 commit f2865d3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
10 changes: 6 additions & 4 deletions .cci.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,17 @@ cosaPod(runAsUser: 0, memory: "4608Mi", cpu: "4") {
// because bootupd is used both during the `rpm-ostree compose tree` as well as
// inside the target operating system.
shwrap("""
git config --global --add safe.directory '*'
mkdir insttree
tar -C insttree -xzvf insttree.tar.gz
rsync -rlv insttree/ /
coreos-assembler init --force https://github.com/coreos/fedora-coreos-config
chown -R -h builder: .
runuser -u builder -- coreos-assembler init --force https://github.com/coreos/fedora-coreos-config
mkdir -p overrides/rootfs
mv insttree/* overrides/rootfs/
rmdir insttree
cosa fetch
cosa build
runuser -u builder -- cosa fetch
runuser -u builder -- cosa build
""")
}
// The e2e-adopt test will use the ostree commit we just generated above
Expand All @@ -63,7 +65,7 @@ cosaPod(runAsUser: 0, memory: "4608Mi", cpu: "4") {
}
stage("Kola testing") {
// The previous e2e leaves things only having built an ostree update
shwrap("cosa build")
shwrap("runuser -u builder -- cosa build")
// bootupd really can't break upgrades for the OS
kola(cosaDir: "${env.WORKSPACE}", extraArgs: "ext.*bootupd*", skipUpgrade: true, skipBasicScenarios: true)
}
Expand Down
7 changes: 4 additions & 3 deletions tests/e2e-update/e2e-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,11 @@ undo_manifest_fork() {

if test -z "${e2e_skip_build:-}"; then
echo "Building starting image"
git config --global --add safe.directory '*'
rm -f ${overrides}/rpm/*.rpm
# Version from F37 GA
add_override grub2-2.06-58.fc37
runv cosa build
runv runuser -u builder -- cosa build
prev_image=$(runv cosa meta --image-path qemu)
create_manifest_fork
rm -f ${overrides}/rpm/*.rpm
Expand All @@ -90,7 +91,7 @@ if test -z "${e2e_skip_build:-}"; then
add_override grub2-2.06-70.fc37
mv ${test_tmpdir}/yumrepo/packages/$(arch)/*.rpm ${overrides}/rpm/
# Only build ostree update
runv cosa build ostree
runv runuser -u builder -- cosa build ostree
undo_manifest_fork
fi
echo "Preparing test"
Expand Down Expand Up @@ -130,7 +131,7 @@ systemd:
EOF
runv butane -o ${testtmp}/test.ign ${testtmp}/test.bu
cd ${testtmp}
qemuexec_args=(kola qemuexec --propagate-initramfs-failure --qemu-image "${prev_image}" --qemu-firmware uefi \
qemuexec_args=(runuser -u builder -- kola qemuexec --propagate-initramfs-failure --qemu-image "${prev_image}" --qemu-firmware uefi \
-i test.ign --bind-ro ${COSA_DIR},/run/cosadir --bind-ro ${bootupd_git},/run/bootupd-source --bind-rw .,/run/testtmp)
if test -n "${e2e_debug:-}"; then
runv ${qemuexec_args[@]} --devshell
Expand Down

0 comments on commit f2865d3

Please sign in to comment.