MSVSphere Packaging Team
1 year ago
parent
216f447909
commit
dc0a95d5f9
@ -1 +1 @@
|
||||
SOURCES/osbuild-composer-76.tar.gz
|
||||
SOURCES/osbuild-composer-88.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
f68a24e9d6a407708e33d72240b140e9c60378f1 SOURCES/osbuild-composer-76.tar.gz
|
||||
9566fbe6bba91c7b3aba1a57c900aa6c00f77397 SOURCES/osbuild-composer-88.tar.gz
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
From 30f4b0753691841e232701a3ad17f018e8799ebe Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Rusz <jrusz@redhat.com>
|
||||
Date: Mon, 20 Mar 2023 15:29:42 +0100
|
||||
Subject: [PATCH 1/3] tests/ostree: Change centos-8 BOOT_LOCATION to a working
|
||||
boot.iso
|
||||
|
||||
The latest boot.iso stopped working. Changing to an older version to
|
||||
unblock CI. RHBZ#2180024 opened with this issue.
|
||||
---
|
||||
test/cases/ostree-rebase-bios.sh | 4 ++--
|
||||
test/cases/ostree-rebase-uefi.sh | 4 ++--
|
||||
test/cases/ostree.sh | 4 ++--
|
||||
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/test/cases/ostree-rebase-bios.sh b/test/cases/ostree-rebase-bios.sh
|
||||
index 702b506c8..7390c2a0e 100755
|
||||
--- a/test/cases/ostree-rebase-bios.sh
|
||||
+++ b/test/cases/ostree-rebase-bios.sh
|
||||
@@ -108,7 +108,7 @@ case "${ID}-${VERSION_ID}" in
|
||||
"centos-8")
|
||||
OSTREE_REF="centos/8/${ARCH}/edge"
|
||||
OS_VARIANT="centos8"
|
||||
- BOOT_LOCATION="http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/"
|
||||
+ BOOT_LOCATION="https://composes.centos.org/latest-CentOS-Stream-8/compose/BaseOS/x86_64/os/"
|
||||
PARENT_REF="centos/8/${ARCH}/edge"
|
||||
KERNEL_RT_PKG="kernel-rt-core"
|
||||
;;
|
||||
@@ -356,7 +356,7 @@ echo -e 'admin\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
|
||||
STOPHERE
|
||||
|
||||
# Get the boot.iso from BOOT_LOCATION
|
||||
-curl -O "$BOOT_LOCATION"/images/boot.iso
|
||||
+curl -O "$BOOT_LOCATION"images/boot.iso
|
||||
sudo mv boot.iso /var/lib/libvirt/images
|
||||
LOCAL_BOOT_LOCATION="/var/lib/libvirt/images/boot.iso"
|
||||
|
||||
diff --git a/test/cases/ostree-rebase-uefi.sh b/test/cases/ostree-rebase-uefi.sh
|
||||
index c0697f543..7c3fd7721 100755
|
||||
--- a/test/cases/ostree-rebase-uefi.sh
|
||||
+++ b/test/cases/ostree-rebase-uefi.sh
|
||||
@@ -108,7 +108,7 @@ case "${ID}-${VERSION_ID}" in
|
||||
"centos-8")
|
||||
OSTREE_REF="centos/8/${ARCH}/edge"
|
||||
OS_VARIANT="centos8"
|
||||
- BOOT_LOCATION="http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/"
|
||||
+ BOOT_LOCATION="https://composes.centos.org/latest-CentOS-Stream-8/compose/BaseOS/x86_64/os/"
|
||||
PARENT_REF="centos/8/${ARCH}/edge"
|
||||
KERNEL_RT_PKG="kernel-rt-core"
|
||||
;;
|
||||
@@ -358,7 +358,7 @@ LIBVIRT_IMAGE_PATH=/var/lib/libvirt/images/${IMAGE_KEY}-uefi.qcow2
|
||||
sudo qemu-img create -f qcow2 "${LIBVIRT_IMAGE_PATH}" 20G
|
||||
|
||||
# Get the boot.iso from BOOT_LOCATION
|
||||
-curl -O "$BOOT_LOCATION"/images/boot.iso
|
||||
+curl -O "$BOOT_LOCATION"images/boot.iso
|
||||
sudo mv boot.iso /var/lib/libvirt/images
|
||||
LOCAL_BOOT_LOCATION="/var/lib/libvirt/images/boot.iso"
|
||||
|
||||
diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh
|
||||
index f2841d953..0cfe6d02a 100755
|
||||
--- a/test/cases/ostree.sh
|
||||
+++ b/test/cases/ostree.sh
|
||||
@@ -104,7 +104,7 @@ case "${ID}-${VERSION_ID}" in
|
||||
OSTREE_REF="centos/8/${ARCH}/edge"
|
||||
OS_VARIANT="centos8"
|
||||
USER_IN_COMMIT="true"
|
||||
- BOOT_LOCATION="http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/"
|
||||
+ BOOT_LOCATION="https://composes.centos.org/latest-CentOS-Stream-8/compose/BaseOS/x86_64/os/"
|
||||
EMBEDED_CONTAINER="true"
|
||||
FIREWALL_FEATURE="false"
|
||||
DIRS_FILES_CUSTOMIZATION="true"
|
||||
@@ -486,7 +486,7 @@ if [[ "${USER_IN_COMMIT}" == "true" ]]; then
|
||||
fi
|
||||
|
||||
# Get the boot.iso from BOOT_LOCATION
|
||||
-curl -O "$BOOT_LOCATION"/images/boot.iso
|
||||
+curl -O "$BOOT_LOCATION"images/boot.iso
|
||||
sudo mv boot.iso /var/lib/libvirt/images
|
||||
LOCAL_BOOT_LOCATION="/var/lib/libvirt/images/boot.iso"
|
||||
|
||||
--
|
||||
2.39.2
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue