Skip to content

Commit d26845a

Browse files
committed
ci: minor updates
- Remove fast track for `virtiofsd` as higher version is installed - Update `grub2` to newer version in ci testing
1 parent 8a472ea commit d26845a

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

.cci.jenkinsfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ cosaPod(runAsUser: 0, memory: "4608Mi", cpu: "4") {
4141
stage("Build FCOS") {
4242
checkout scm
4343
unstash 'build'
44-
// Fast track https://bodhi.fedoraproject.org/updates/FEDORA-2023-5041615f94
45-
shwrap("sudo dnf -y update https://kojipkgs.fedoraproject.org//packages/virtiofsd/1.7.0/5.fc38/x86_64/virtiofsd-1.7.0-5.fc38.x86_64.rpm")
4644
// Note that like {rpm-,}ostree we want to install to both / and overrides/rootfs
4745
// because bootupd is used both during the `rpm-ostree compose tree` as well as
4846
// inside the target operating system.

tests/e2e-update/e2e-update.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ undo_manifest_fork() {
8080
if test -z "${e2e_skip_build:-}"; then
8181
echo "Building starting image"
8282
rm -f ${overrides}/rpm/*.rpm
83-
# Version from F37 GA
84-
add_override grub2-2.06-89.fc38
83+
# Version from F39 GA
84+
add_override grub2-2.06-100.fc39
8585
runv cosa build
8686
prev_image=$(runv cosa meta --image-path qemu)
8787
create_manifest_fork
8888
rm -f ${overrides}/rpm/*.rpm
8989
echo "Building update ostree"
9090
# Version queued in current updates
91-
add_override grub2-2.06-102.fc38
91+
add_override grub2-2.06-123.fc40
9292
mv ${test_tmpdir}/yumrepo/packages/$(arch)/*.rpm ${overrides}/rpm/
9393
# Only build ostree update
9494
runv cosa build ostree

0 commit comments

Comments
 (0)