Merge pull request #3114 from openSUSE/import_rest_of_pontifex_local_…

…changes Import rest of pontifex local changes
openSUSE · Jun 18, 2024 · 3244aa8 · 3244aa8
2 parents f155c32 + cf8efaa
commit 3244aa8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/publish_distro_conf/publish_leap-micro55_appliances.config b/publish_distro_conf/publish_leap-micro55_appliances.config
@@ -6,7 +6,8 @@ logfile_base=~/publish_logs/$micro_version-appliances/$(date -d "$date" '+%Y/%m/
 synclog="${logfile_base}.log"
 deletelog="${logfile_base}-deletes.log"
 path="/distribution/leap-micro/$micro_version/appliances"
-flavors=(Default Default-RT Default-SelfInstall)
+flavors=()
+#flavors=(Default Default-RT Default-SelfInstall)
 repos=()
 extra_repos=()
 isodir=""

diff --git a/publish_distro_conf/publish_leap-micro60_appliances.config b/publish_distro_conf/publish_leap-micro60_appliances.config
@@ -1,20 +1,19 @@
 # vim:syntax=sh
 
 micro_version=6.0
-release=0
 logfile_base=~/publish_logs/$micro_version-appliances/$(date -d "$date" '+%Y/%m/%d/%H%M')
 synclog="${logfile_base}.log"
 deletelog="${logfile_base}-deletes.log"
 path="/distribution/leap-micro/$micro_version/appliances"
-flavors=(Default Default-RT Default-SelfInstall)
+flavors=(Default-SelfInstall)
 repos=()
 extra_repos=()
 isodir=""
 
 get_version() {
 	# get expected version from first flavor
 	if [ -z "$version" ]; then
-		version=`echo $stage/openSUSE-Leap-Micro.x86_64-$micro_version.$release-$flavor-Build*.raw.xz`
+		version=`echo $stage/openSUSE-Leap-Micro.x86_64-$micro_version-$flavor-Build*.raw.xz`
 		version=${version##*Build}
 		version=${version%.*}
 		if [ -z "$version" ]; then
@@ -29,7 +28,7 @@ _get_iso()
 	local snapshot="$1"
 	local suffix=xz
 #	echo "openSUSE-Leap-Micro-$micro_version-JeOS.x86_64-$micro_version.0-$flavor-$snapshot.$suffix"
-	echo "openSUSE-Leap-Micro.x86_64-$micro_version.$release-$flavor-$snapshot.$suffix"
+	echo "openSUSE-Leap-Micro.x86_64-$micro_version-$flavor-$snapshot.$suffix"
 }
 
 get_iso()

diff --git a/publish_distro_conf/publish_leap156.config b/publish_distro_conf/publish_leap156.config
@@ -7,6 +7,7 @@ synclog="${logfile_base}.log"
 deletelog="${logfile_base}-deletes.log"
 path="/distribution/leap/$leap_version"
 flavors=(DVD-x86_64 NET-x86_64 DVD-aarch64 NET-aarch64 DVD-ppc64le NET-ppc64le DVD-s390x NET-s390x)
+# flavors=(DVD-x86_64 DVD-aarch64 DVD-ppc64le DVD-s390x)
 
 get_version() {
 	# get expected version from first flavor