Merge pull request #3071 from lkocman/leapmicro60

LeapMicro 6.0 pkglistgen for 000productcompose
openSUSE · Jun 18, 2024 · f155c32 · f155c32
2 parents 0b60495 + 2ec0d7a
commit f155c32
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/gocd/leapmicro.target.gocd.yaml b/gocd/leapmicro.target.gocd.yaml
@@ -31,8 +31,8 @@ pipelines:
       git:
         git: https://github.com/openSUSE/openSUSE-release-tools.git
     stages:
-    - Update.000product:
+    - Update.000productcompose:
         resources:
         - repo-checker
         tasks:
-          - script: ./pkglistgen.py -A https://api.opensuse.org --debug update_and_solve -p openSUSE:Leap:Micro:6.0 -s target
+          - script: ./pkglistgen.py --verbose -A https://api.opensuse.org update_and_solve --project openSUSE:Leap:Micro:6.0 --scope target --engine product_composer --force
diff --git a/publish_distro_conf/publish_leap-micro60.config b/publish_distro_conf/publish_leap-micro60.config
@@ -6,12 +6,13 @@ logfile_base=~/publish_logs/$micro_version/$(date -d "$date" '+%Y/%m/%d/%H%M')
 synclog="${logfile_base}.log"
 deletelog="${logfile_base}-deletes.log"
 path="/distribution/leap-micro/$micro_version/product"
-flavors=(DVD-x86_64 DVD-aarch64)
+flavors=(x86_64 aarch64)
 
+# openSUSE-Leap-Micro-6.0-aarch64-Build13.1.iso is the filename by 000productcompose
 get_version() {
 	# get expected version from first flavor
 	if [ -z "$version" ]; then
-		version=`echo $stage/iso/openSUSE-Leap-Micro-$micro_version$qu-$flavor-Build[0123456789]*.[0123456789]*-Media.iso`
+		version=`echo $stage/iso/openSUSE-Leap-Micro-$micro_version$qu-$flavor-Build[0123456789]*.[0123456789]*.iso`
 		version=${version##*Build}
 		version=${version%-*}
 		if [ -z "$version" ]; then
@@ -23,7 +24,8 @@ get_version() {
 
 get_iso()
 {
-	iso="openSUSE-Leap-Micro-$micro_version$qu-$flavor-Build$version-Media.iso"
+	# openSUSE-Leap-Micro-6.0-aarch64-Build13.1.iso
+	iso="openSUSE-Leap-Micro-$micro_version$qu-$flavor-Build$version.iso"
 }
 
 get_iso_link()