diff --git a/script/cfg.py b/script/cfg.py index 247e0a38..754c385b 100644 --- a/script/cfg.py +++ b/script/cfg.py @@ -244,6 +244,7 @@ def pre_openqa_call_start(repos): [ -n "$iso" ] || [ "$flavor" != "''' + assets_flavor + '''" ] || buildex=$(grep -o -E '(Build|Snapshot)[^-]*' __envsub/files_asset.lst | head -n 1) [ -n "$iso$build" ] || build=$(grep -h -o -E '(Build|Snapshot)[^-]*' __envsub/Media1*.lst 2>/dev/null | head -n 1 | grep -o -E '[0-9]\.?[0-9]+(\.[0-9]+)*')|| : [ -n "$build" ] || continue + buildex=${buildex/.install.iso/} buildex=${buildex/.iso/} buildex=${buildex/.raw.xz/} buildex=${buildex/.qcow2/} diff --git a/t/obs/openSUSE:Factory:ToTest/microos-qcow/print_openqa.before b/t/obs/openSUSE:Factory:ToTest/microos-qcow/print_openqa.before index 3b27e247..9cdd9db8 100644 --- a/t/obs/openSUSE:Factory:ToTest/microos-qcow/print_openqa.before +++ b/t/obs/openSUSE:Factory:ToTest/microos-qcow/print_openqa.before @@ -88,21 +88,21 @@ FLAVOR=MicroOS-SelfInstall \ FULLURL=1 \ ISO=openSUSE-MicroOS.x86_64-16.0.0-SelfInstall-Snapshot20240222.install.iso \ - MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222.install \ - MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222.install \ + MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222 \ + MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222 \ MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \ - REPO_0=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222.install \ - REPO_1=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20240222.install \ - REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222.install-debuginfo \ - REPO_3=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222.install-source \ - REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240222.install \ - REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240222.install \ - REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222.install \ - REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222.install-debuginfo \ + REPO_0=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222 \ + REPO_1=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20240222 \ + REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-debuginfo \ + REPO_3=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-source \ + REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240222 \ + REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240222 \ + REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222 \ + REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-debuginfo \ REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \ - REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222.install-source \ + REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-source \ REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*,yast2-http-server*' \ - SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222.install \ + SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222 \ VERSION=Tumbleweed \ _OBSOLETE=1