From bd3e47ed45033072eeed08c14aeb0e0485e66a3d Mon Sep 17 00:00:00 2001 From: Lubos Kocman Date: Tue, 29 Nov 2022 13:21:27 +0100 Subject: [PATCH] Limit flavors to just one * correct pattern in get_iso as test run on empty dir exposed bug * get rid of old comment referencing jeos after rename --- publish_distro_conf/publish_leap155_appliances.config | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/publish_distro_conf/publish_leap155_appliances.config b/publish_distro_conf/publish_leap155_appliances.config index bfba2f0d..cabc41da 100644 --- a/publish_distro_conf/publish_leap155_appliances.config +++ b/publish_distro_conf/publish_leap155_appliances.config @@ -5,7 +5,7 @@ logfile_base=~/publish_logs/$leap_version-appliances/$(date -d "$date" '+%Y/%m/% synclog="${logfile_base}.log" deletelog="${logfile_base}-deletes.log" path="/distribution/leap/$leap_version/appliances" -flavors=(kvm-and-xen MS-HyperV OpenStack-Cloud VMware) +flavors=(kvm-and-xen ) #flavors=() repos=() extra_repos=() @@ -14,7 +14,7 @@ isodir="" get_version() { # get expected version from first flavor if [ -z "$version" ]; then - version=`echo $stage/openSUSE-Leap-$leap_version-Minimal-VM.x86_64-$flavor-Build*.qcow2` + version=`echo $stage/openSUSE-Leap-$leap_version-Minimal-VM.x86_64-$flavor-Build*.qcow2` version=${version##*Build} version=${version%.*} if [ -z "$version" ]; then @@ -33,9 +33,7 @@ _get_iso() elif [ "$flavor" = 'VMware' ]; then suffix=vmdk.xz fi -# echo "openSUSE-Leap-$leap_version-JeOS.x86_64-$leap_version.0-$flavor-$snapshot.$suffix" - echo "openSUSE-Leap-$leap_version-Minimal*.x86_64-$flavor-$snapshot.$suffix" - + echo "openSUSE-Leap-$leap_version-Minimal-VM.x86_64-$flavor-$snapshot.$suffix" } get_iso()