From 8a5d90845f6a505688ec88925596d7b4b8959c8d Mon Sep 17 00:00:00 2001 From: Andrii Nikitin Date: Fri, 30 Aug 2024 09:52:47 +0200 Subject: [PATCH] Leap16 add repos --- script/cfg.py | 8 ++++++++ script/scriptgen.py | 9 ++++++++- t/obs/openSUSE:Leap:16.0:ToTest/files_iso.lst | 6 ++++-- t/obs/openSUSE:Leap:16.0:ToTest/files_repo.lst | 1 + .../print_openqa.before | 16 ++++++++++------ .../print_rsync_iso.before | 8 ++++---- .../print_rsync_repo.before | 3 +++ xml/obs/openSUSE:Leap:16.0.xml | 9 +++++++-- 8 files changed, 45 insertions(+), 15 deletions(-) create mode 100644 t/obs/openSUSE:Leap:16.0:ToTest/files_repo.lst diff --git a/script/cfg.py b/script/cfg.py index 7d1002ab..de858eb8 100644 --- a/script/cfg.py +++ b/script/cfg.py @@ -115,6 +115,8 @@ def pre_rsync_repo(repos): [ ! -f __envsub/files_repo.lst ] || ! grep -q -- "-POOL-" __envsub/files_repo.lst || additional_repo_suffix=-POOL [ -n "$buildid" ] || buildid=$(grep -hEo 'Build[0-9]+(.[0-9]+)?' __envsub/Media1_*.lst 2>/dev/null | head -n 1) +buildid=${buildid/.iso} + for repo in {REPOOWNLIST,}; do while read src; do [ ! -z "$src" ] || continue @@ -375,6 +377,8 @@ def openqa_call_extra(repos): repoKey=${repot} repoKey=${repoKey^^} repoKey=${repoKey//-/_} + repoKey=${repoKey//./_} + repoKey=${repoKey//$/} echo " REPO_$i=$repoDest \\\\" ''' + openqa_call_repot_part3() + ''' ''' + openqa_call_build_id_from_iso2(build_id_from_iso) + ''' @@ -408,6 +412,8 @@ def openqa_call_repot1_debugsource(): repoKey=REPOKEY repoKey=${repoKey^^} repoKey=${repoKey//-/_} + repoKey=${repoKey//./_} + repoKey=${repoKey//$/} ''' + openqa_call_repot1_debugsource() + ''' dest=${dest//-Media1/} dest=${dest//-Media2/} @@ -433,6 +439,8 @@ def openqa_call_repot1_debugsource(): ''' + openqa_call_repot1_debugsource() + ''' repoKey=${repoKey^^} repoKey=${repoKey//-/_} + repoKey=${repoKey//./_} + repoKey=${repoKey//$/} ''' def openqa_call_news_end(distri, news, news_arch): diff --git a/script/scriptgen.py b/script/scriptgen.py index 64535e83..2a602b4a 100644 --- a/script/scriptgen.py +++ b/script/scriptgen.py @@ -581,7 +581,14 @@ def gen_read_files(self, f): self.p(cfg.read_files_repo_link3, f) if self.repos: if self.media1 == "0": - self.p(cfg.read_files_repo, f, "| grep -P 'Media1(.license)?$'", "") + self.p( + cfg.read_files_repo, + f, + "| grep -P 'Media1(.license)?$'", + "", + "| grep -P 'Media[1-3](.license)?$'", + "", + ) else: self.p(cfg.read_files_repo, f) if self.build_id_from_iso: diff --git a/t/obs/openSUSE:Leap:16.0:ToTest/files_iso.lst b/t/obs/openSUSE:Leap:16.0:ToTest/files_iso.lst index a13c8178..4e3f02f3 100644 --- a/t/obs/openSUSE:Leap:16.0:ToTest/files_iso.lst +++ b/t/obs/openSUSE:Leap:16.0:ToTest/files_iso.lst @@ -1,4 +1,6 @@ -agama-installer-Leap.aarch64.9.0.0-openSUSE-Build2.4.iso +agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso +agama-installer-Leap.aarch64-9.0.0-openSUSE-PXE-Build2.4.install.iso agama-installer-Leap.ppc64le-9.0.0-openSUSE-Build2.4.iso agama-installer-Leap.s390x-9.0.0-openSUSE-Build2.4.iso -agama-installer-Leap.x86_64.9.0.0-openSUSE-Build2.4.iso +agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso +agama-installer-Leap.x86_64-9.0.0-openSUSE-PXE-Build2.4.install.iso diff --git a/t/obs/openSUSE:Leap:16.0:ToTest/files_repo.lst b/t/obs/openSUSE:Leap:16.0:ToTest/files_repo.lst new file mode 100644 index 00000000..25cf8cc7 --- /dev/null +++ b/t/obs/openSUSE:Leap:16.0:ToTest/files_repo.lst @@ -0,0 +1 @@ +Leap-16.0-aarch64-ppc64le-s390x-x86_64 diff --git a/t/obs/openSUSE:Leap:16.0:ToTest/print_openqa.before b/t/obs/openSUSE:Leap:16.0:ToTest/print_openqa.before index 79f2f8aa..287bf6c2 100644 --- a/t/obs/openSUSE:Leap:16.0:ToTest/print_openqa.before +++ b/t/obs/openSUSE:Leap:16.0:ToTest/print_openqa.before @@ -1,22 +1,26 @@ /usr/bin/openqa-cli api -X post isos?async=1 \ ARCH=aarch64 \ - ASSET_256=agama-installer-Leap.aarch64.9.0.0-openSUSE-Build2.4.iso.sha256 \ + ASSET_256=agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso.sha256 \ BUILD=2.4 \ - CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.aarch64.9.0.0-openSUSE-Build2.4.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \ + CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \ DISTRI=opensuse \ FLAVOR=agama-installer-Leap \ - ISO=agama-installer-Leap.aarch64.9.0.0-openSUSE-Build2.4.iso \ + ISO=agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso \ + REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build2.4 \ + REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build2.4 \ VERSION=16.0 \ _OBSOLETE=1 /usr/bin/openqa-cli api -X post isos?async=1 \ ARCH=x86_64 \ - ASSET_256=agama-installer-Leap.x86_64.9.0.0-openSUSE-Build2.4.iso.sha256 \ + ASSET_256=agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso.sha256 \ BUILD=2.4 \ - CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.x86_64.9.0.0-openSUSE-Build2.4.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \ + CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \ DISTRI=opensuse \ FLAVOR=agama-installer-Leap \ - ISO=agama-installer-Leap.x86_64.9.0.0-openSUSE-Build2.4.iso \ + ISO=agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso \ + REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build2.4 \ + REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build2.4 \ VERSION=16.0 \ _OBSOLETE=1 diff --git a/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_iso.before b/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_iso.before index b9017fe5..a3906098 100644 --- a/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_iso.before +++ b/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_iso.before @@ -1,4 +1,4 @@ -rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.aarch64.9.0.0-openSUSE-Build2.4.iso /var/lib/openqa/factory/iso/agama-installer-Leap.aarch64.9.0.0-openSUSE-Build2.4.iso -rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.aarch64.9.0.0-openSUSE-Build2.4.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.aarch64.9.0.0-openSUSE-Build2.4.iso.sha256 -rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.x86_64.9.0.0-openSUSE-Build2.4.iso /var/lib/openqa/factory/iso/agama-installer-Leap.x86_64.9.0.0-openSUSE-Build2.4.iso -rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.x86_64.9.0.0-openSUSE-Build2.4.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.x86_64.9.0.0-openSUSE-Build2.4.iso.sha256 +rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso /var/lib/openqa/factory/iso/agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso +rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.aarch64-9.0.0-openSUSE-Build2.4.iso.sha256 +rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso /var/lib/openqa/factory/iso/agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso +rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.x86_64-9.0.0-openSUSE-Build2.4.iso.sha256 diff --git a/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_repo.before b/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_repo.before index e69de29b..e4a6fab9 100644 --- a/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_repo.before +++ b/t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_repo.before @@ -0,0 +1,3 @@ +# Leap-16.0-aarch64-ppc64le-s390x-x86_64$ +rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/product/local/000productcompose/Leap-16.0-aarch64-ppc64le-s390x-x86_64/ /var/lib/openqa/factory/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-CURRENT +rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-CURRENT/ /var/lib/openqa/factory/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-CURRENT/ /var/lib/openqa/factory/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build2.4/ diff --git a/xml/obs/openSUSE:Leap:16.0.xml b/xml/obs/openSUSE:Leap:16.0.xml index db7bdca2..48a85cc5 100644 --- a/xml/obs/openSUSE:Leap:16.0.xml +++ b/xml/obs/openSUSE:Leap:16.0.xml @@ -1,7 +1,12 @@ - + + + + +