From 8d75dcd35af489322ba293797bb8e37309fadec9 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Tue, 19 Sep 2023 18:04:12 +0800 Subject: [PATCH] test: add workaround for issue JIRA#RHEL-4992 ostree-fdo-container.sh ostree-simplified-ionstaller.sh and ostree-fdo-aio.sh will install latest fdo packages --- ostree-fdo-container.sh | 3 --- setup.sh | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ostree-fdo-container.sh b/ostree-fdo-container.sh index 9cdb2aaa8..ce4f3a296 100755 --- a/ostree-fdo-container.sh +++ b/ostree-fdo-container.sh @@ -49,9 +49,6 @@ case "${ID}-${VERSION_ID}" in OSTREE_REF="rhel/9/${ARCH}/edge" OS_VARIANT="rhel9-unknown" BOOT_ARGS="uefi" - sudo wget http://download-node-02.eng.bos.redhat.com/rhel-9/nightly/RHEL-9/RHEL-9.3.0-20230915.0/compose/AppStream/x86_64/os/Packages/fdo-{admin-cli,client,init,manufacturing-server,owner-cli,owner-onboarding-server,rendezvous-server}-0.4.12-4.el9_2.x86_64.rpm -P /var/www/html/packages - sudo createrepo_c /var/www/html/packages - sudo restorecon -Rv /var/www/html/packages ;; "centos-9") OSTREE_REF="centos/9/${ARCH}/edge" diff --git a/setup.sh b/setup.sh index 331834b77..b7829fa38 100755 --- a/setup.sh +++ b/setup.sh @@ -178,6 +178,11 @@ sudo composer-cli status show sudo mkdir -p /var/www/html/packages sudo curl -s -o /var/www/html/packages/greenboot-failing-unit-1.0-1.el8.noarch.rpm https://kite-webhook-prod.s3.amazonaws.com/greenboot-failing-unit-1.0-1.el8.noarch.rpm +# workaround for bug https://issues.redhat.com/browse/RHEL-4992 +if [[ "$VERSION_ID" == "9.3" ]]; then + sudo wget http://download-node-02.eng.bos.redhat.com/rhel-9/nightly/RHEL-9/RHEL-9.3.0-20230915.0/compose/AppStream/x86_64/os/Packages/fdo-{admin-cli,client,init,manufacturing-server,owner-cli,owner-onboarding-server,rendezvous-server}-0.4.12-4.el9_2.x86_64.rpm -P /var/www/html/packages +fi + # RHEL for Edge package CI test if [ -e packages/package_ci_trigger ]; then source packages/package_ci_trigger