From 397f900dceb934fd34c4d1022a16ccfa28bbbbaf Mon Sep 17 00:00:00 2001
From: "lemon.li" <leli@suse.com>
Date: Fri, 6 Sep 2024 13:54:33 +0800
Subject: [PATCH] Remove iso_path="iso" for agama s390x

---
 t/obs/systemsmanagement:Agama:Devel/s390x/files_iso.lst       | 4 ++++
 .../s390x/print_rsync_iso.before                              | 4 ++--
 xml/obs/systemsmanagement:Agama:Devel.xml                     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/t/obs/systemsmanagement:Agama:Devel/s390x/files_iso.lst b/t/obs/systemsmanagement:Agama:Devel/s390x/files_iso.lst
index 7141d0d0..063d298c 100644
--- a/t/obs/systemsmanagement:Agama:Devel/s390x/files_iso.lst
+++ b/t/obs/systemsmanagement:Agama:Devel/s390x/files_iso.lst
@@ -2,3 +2,7 @@ agama-installer.aarch64-9.0.0-openSUSE-Build17.9.iso
 agama-installer.ppc64le-9.0.0-openSUSE-Build17.9.iso
 agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso
 agama-installer.x86_64-9.0.0-openSUSE-Build17.9.iso
+agama-installer.aarch64-9.0.0-openSUSE-Build17.19.iso
+agama-installer.ppc64le-9.0.0-openSUSE-Build17.19.iso
+agama-installer.s390x-9.0.0-openSUSE-Build17.19.iso
+agama-installer.x86_64-9.0.0-openSUSE-Build17.19.iso
diff --git a/t/obs/systemsmanagement:Agama:Devel/s390x/print_rsync_iso.before b/t/obs/systemsmanagement:Agama:Devel/s390x/print_rsync_iso.before
index 46d31199..f0b231b7 100644
--- a/t/obs/systemsmanagement:Agama:Devel/s390x/print_rsync_iso.before
+++ b/t/obs/systemsmanagement:Agama:Devel/s390x/print_rsync_iso.before
@@ -1,5 +1,5 @@
-rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//iso/images/*/agama-installer:openSUSE//*agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso /var/lib/openqa/factory/iso/agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso
-rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//iso/images/*/agama-installer:openSUSE//*agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso.sha256 /var/lib/openqa/factory/other/agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso.sha256
+rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso /var/lib/openqa/factory/iso/agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso
+rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement:Agama:Devel//images/*/agama-installer:openSUSE//*agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso.sha256 /var/lib/openqa/factory/other/agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso.sha256
 [ -d /var/lib/openqa/factory/repo/agama-installer.s390x-9.0.0-openSUSE-Build17.9 ] || {
     mkdir /var/lib/openqa/factory/repo/agama-installer.s390x-9.0.0-openSUSE-Build17.9
     bsdtar xf /var/lib/openqa/factory/iso/agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso -C /var/lib/openqa/factory/repo/agama-installer.s390x-9.0.0-openSUSE-Build17.9
diff --git a/xml/obs/systemsmanagement:Agama:Devel.xml b/xml/obs/systemsmanagement:Agama:Devel.xml
index a3981458..972c3aa6 100644
--- a/xml/obs/systemsmanagement:Agama:Devel.xml
+++ b/xml/obs/systemsmanagement:Agama:Devel.xml
@@ -6,7 +6,7 @@
     <batch name="base" archs="86_64 aarch64 ppc64le">
         <flavor name="agama-installer" folder="images/*/agama-installer:openSUSE/" iso="1" media1="0"/>
     </batch>
-    <batch name="s390x" archs="s390x" iso_path="iso">
+    <batch name="s390x" archs="s390x">
 	<flavor name="agama-installer" folder="images/*/agama-installer:openSUSE/" iso="extract_as_repo" media1="0"/>
     </batch>
 </openQA>