[neon/infrastructure/pangea-data] imager: pass in future_series variable and use that to calculate when extra naming requirements are needed

[Carlos De Maine]

Git commit 0b8299fae4b406eb80ff0dda7e7c3a1b8179dbf8 by Carlos De Maine.
Committed on 17/10/2024 at 11:06.
Pushed by jriddell into branch 'master'.

pass in future_series variable and use that to calculate when extra naming requirements are needed

M  +33   -41   imager/build.sh

https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/0b8299fae4b406eb80ff0dda7e7c3a1b8179dbf8

diff --git a/imager/build.sh b/imager/build.sh
index f0561b1..fc88c84 100755
--- a/imager/build.sh
+++ b/imager/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -ex
-echo "neon -- build.sh"
+echo "neon -- starting build.sh"
 
 cleanup() {
     if [ ! -d build ]; then
@@ -22,8 +22,9 @@ export TYPE=$4
 export METAPACKAGE=$5
 export IMAGENAME=$6
 export NEONARCHIVE=$7
+export FUTURE_SERIES=$8
 
-if [ -z $WD ] || [ -z $DIST ] || [ -z $ARCH ] || [ -z $TYPE ] || [ -z $METAPACKAGE ] || [ -z $IMAGENAME ] || [ -z $NEONARCHIVE ]; then
+if [ -z $WD ] || [ -z $DIST ] || [ -z $ARCH ] || [ -z $TYPE ] || [ -z $METAPACKAGE ] || [ -z $IMAGENAME ] || [ -z $NEONARCHIVE ] [ -z $FUTURE_SERIES ]; then
     echo "!!! Not all arguments provided! ABORT !!!"
     env
     exit 1
@@ -99,7 +100,8 @@ DATE="${_DATE}${_TIME}"
 # around defaults-image by exporting the vars lb uses :O
 
 ## Super internal var used in lb_binary_disk to figure out the version of LB_DISTRIBUTION
-# used in e.g. renaming the ubiquity .desktop file on Desktop by casper which gets it from /cdrom/.disk/info from live-build lb_binary_disk
+# used in e.g. renaming the ubiquity .desktop file on Desktop by casper which gets it from
+# /cdrom/.disk/info from live-build lb_binary_disk
 EDITION=$TYPE
 export RELEASE_${DIST}=${EDITION}
 
@@ -163,55 +165,47 @@ cd ../result/
 
 
 
-# During LTS update
-# change to include $DIST to be able to differentiate iso's e.g.-> neon-noble-release-#######.iso
-# if [ $TYPE = 'release' ] || [ $DIST = 'noble' ]; then
-if [ $TYPE = 'release' ]; then
-    # morph type into new_type so that the edition is in the iso name for the special cases
-    new_type="${NEONARCHIVE}-${TYPE}"
+# All *release* iso's and also during LTS update all FUTURE_SERIES iso are published to a different location
+# and namingaltered to include $DIST to be able to differentiate iso's e.g.-> neon-noble-release-#######.iso
+# we also override TYPE with the 'new_type' variable to alter naming for non-desktop editions
+new_type="${NEONARCHIVE}-${TYPE}"
+
+if [ $TYPE = 'release' ] || [ $DIST == "${FUTURE_SERIES}" ]; then
     if [ $TYPE = 'bigscreen' ] || [ $TYPE = 'developer' ] || [ $TYPE = 'ko' ] ||  [ $TYPE = 'mobile' ]; then
         new_iso_name_timestamped="${IMAGENAME}-${DIST}-$new_type-${DATETIME}"
     else
         new_iso_name_timestamped="${IMAGENAME}-${DIST}-${TYPE}-${DATETIME}"
     fi
+elif [ $TYPE = 'bigscreen' ] || [ $TYPE = 'developer' ] || [ $TYPE = 'ko' ] ||  [ $TYPE = 'mobile' ]; then
+    new_iso_name_timestamped="${IMAGENAME}-$new_type-${DATETIME}"
+else
+    # don't change desktop iso's names for current_release
+    new_iso_name_timestamped="${IMAGENAME}-${TYPE}-${DATETIME}"
+fi
 
-    for f in live*; do
-        new_iso_name_timestamper=$(echo $f | sed "s/livecd\.neon/$new_iso_name_timestamped/")
-        mv $f $new_iso_name_timestamper
-    done
+# timestamp our artifacts
+for f in live*; do
+    new_iso_name_timestamper=$(echo $f | sed "s/livecd\.neon/$new_iso_name_timestamped/")
+    mv $f $new_iso_name_timestamper
+done
 
+if [ $TYPE = 'release' ] || [ $DIST == "${FUTURE_SERIES}" ]; then
     if [ $TYPE = 'bigscreen' ] || [ $TYPE = 'developer' ] || [ $TYPE = 'ko' ] ||  [ $TYPE = 'mobile' ]; then
         new_iso_name_current="${IMAGENAME}-${DIST}-$new_type-current"
     else
         new_iso_name_current="${IMAGENAME}-${DIST}-${TYPE}-current"
     fi
-
-    ln -s $new_iso_name_timestamped.iso $new_iso_name_current.iso
-    zsyncmake $new_iso_name_current.iso
-    sha256sum $new_iso_name_timestamped.iso > $new_iso_name_timestamped.sha256sum
-# write our message
-cat > .message << END
-KDE neon
-
-$new_iso_name_timestamped.iso Live and Installable ISO
-$new_iso_name_timestamped.iso.sig PGP Digital Signature
-$new_iso_name_timestamped.manifest ISO contents
-$new_iso_name_timestamped.sha256sum Checksum
-$new_iso_name_timestamped.torrent Web Seed torrent (you client needs to support web seeds or it may not work)
-"current" files are the same files for those wanting a URL which does not change daily.
-END
-# don't change jammy iso's apart from unpublished release iso
+elif [ $TYPE = 'bigscreen' ] || [ $TYPE = 'developer' ] || [ $TYPE = 'ko' ] ||  [ $TYPE = 'mobile' ]; then
+    new_iso_name_current="${IMAGENAME}-$new_type-current"
 else
-new_iso_name_timestamped="${IMAGENAME}-${TYPE}-${DATETIME}"
-    for f in live*; do
-        new_iso_name_timestamper=$(echo $f | sed "s/livecd\.neon/$new_iso_name_timestamped/")
-        mv $f $new_iso_name_timestamper
-    done
     new_iso_name_current="${IMAGENAME}-${TYPE}-current"
-    ln -s $new_iso_name_timestamped.iso $new_iso_name_current.iso
-    zsyncmake $new_iso_name_current.iso
-    sha256sum $new_iso_name_timestamped.iso > $new_iso_name_timestamped.sha256sum
-# write our message
+fi
+
+ln -s $new_iso_name_timestamped.iso $new_iso_name_current.iso
+zsyncmake $new_iso_name_current.iso
+sha256sum $new_iso_name_timestamped.iso > $new_iso_name_timestamped.sha256sum
+
+# write our torrent message
 cat > .message << END
 KDE neon
 
@@ -223,9 +217,7 @@ $new_iso_name_timestamped.torrent Web Seed torrent (you client needs to support
 "current" files are the same files for those wanting a URL which does not change daily.
 END
 
-fi
-
-# change ownership to make jenkins happy
+# change ownership to make jenkins happy and pass through required bits
 echo $DATETIME > date_stamp
 echo $new_type > new_type
 pwd