[neon/infrastructure/pangea-data] imager: adapt iso name creation to use edition

[Carlos De Maine]

Git commit 00cf5a761b5e16b5b013ac519e6b2ad1b2d026e8 by Carlos De Maine.
Committed on 03/09/2026 at 04:07.
Pushed by carlosdem into branch 'master'.

adapt iso name creation to use edition

M  +12   -12   imager/build.sh

https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/00cf5a761b5e16b5b013ac519e6b2ad1b2d026e8

diff --git a/imager/build.sh b/imager/build.sh
index 273dc10..ddf0c4f 100755
--- a/imager/build.sh
+++ b/imager/build.sh
@@ -23,8 +23,10 @@ export METAPACKAGE=$5
 export IMAGENAME=$6
 export NEONARCHIVE=$7
 export FUTURE_SERIES=$8
+export EDITION=$9
+export JOB_NAME=${10}
 
-if [ -z $WD ] || [ -z $DIST ] || [ -z $ARCH ] || [ -z $TYPE ] || [ -z $METAPACKAGE ] || [ -z $IMAGENAME ] || [ -z $NEONARCHIVE ] || [ -z $FUTURE_SERIES ]; then
+if [ -z $WD ] || [ -z $DIST ] || [ -z $ARCH ] || [ -z $TYPE ] || [ -z $METAPACKAGE ] || [ -z $IMAGENAME ] || [ -z $NEONARCHIVE ] || [ -z $FUTURE_SERIES ] || [ -z $EDITION ] || [ -z $JOB_NAME ]; then
     echo "!!! Not all arguments provided! ABORT !!!"
     env
     exit 1
@@ -39,8 +41,7 @@ uname --all
 # FIXME: let nci/lib/setup_repo.rb handle the repo setup as well this is just
 # duplicate code here...
 ls -lah /tooling/nci
-/tooling/nci/setup_apt_repo.rb --no-repo
-sudo apt-add-repository http://archive.neon.kde.org/${NEONARCHIVE}
+/tooling/nci/setup_apt_repo.rb ${TYPE}
 sudo apt update
 sudo apt dist-upgrade -y
 sudo apt install -y --no-install-recommends \
@@ -102,7 +103,6 @@ DATE="${_DATE}${_TIME}"
 ## 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
-EDITION=$TYPE
 export RELEASE_${DIST}=${EDITION}
 
 ## Bring down the overall size a bit by using a more sophisticated albeit expensive algorithm.
@@ -129,10 +129,10 @@ export LB_ARCHIVES="http://archive.neon.kde.org/${NEONARCHIVE}"
 [ -z "$SEEDED_SNAPS" ] && SEEDED_SNAPS="$(dirname "$0")/seeded-snaps-${IMAGENAME}"
 
 # direct to correct config and hook locations
-if [ $TYPE = 'developer' ] || [ $TYPE = 'ko' ] || [ $TYPE = 'mobile' ] || [ $TYPE = 'bigscreen' ]; then
-    CONFIG_SETTINGS="$(dirname "$0")/config-settings-${IMAGENAME}-${TYPE}.sh"
-    CONFIG_HOOKS="$(dirname "$0")/config-hooks-${IMAGENAME}-${TYPE}"
-    BUILD_HOOKS="$(dirname "$0")/build-hooks-${IMAGENAME}-${TYPE}"
+if [ $EDITION = 'developer' ] || [ $EDITION = 'ko' ] || [ $EDITION = 'mobile' ] || [ $EDITION = 'bigscreen' ]; then
+    CONFIG_SETTINGS="$(dirname "$0")/config-settings-${IMAGENAME}-${EDITION}.sh"
+    CONFIG_HOOKS="$(dirname "$0")/config-hooks-${IMAGENAME}-${EDITION}"
+    BUILD_HOOKS="$(dirname "$0")/build-hooks-${IMAGENAME}-${EDITION}"
 fi
 
 export CONFIG_SETTINGS CONFIG_HOOKS BUILD_HOOKS SEEDED_SNAPS
@@ -166,9 +166,9 @@ cd ../result/
 # All ${FUTURE_SERIES} iso are published to a different location and naming altered to
 # include $DIST to be able to differentiate iso's e.g.-> neon-noble-release-#######.iso
 if [ $DIST == "${FUTURE_SERIES}" ]; then
-    new_iso_name_timestamped="${IMAGENAME}-${DIST}-${NEONARCHIVE}-${TYPE}-${DATETIME}"
+    new_iso_name_timestamped="${IMAGENAME}-${DIST}-${NEONARCHIVE}-${EDITION}-${DATETIME}"
 else
-    new_iso_name_timestamped="${IMAGENAME}-${NEONARCHIVE}-${TYPE}-${DATETIME}"
+    new_iso_name_timestamped="${IMAGENAME}-${NEONARCHIVE}-${EDITION}-${DATETIME}"
 fi
 
 # timestamp our artifacts
@@ -178,9 +178,9 @@ for f in live*; do
 done
 
 if [ $DIST == "${FUTURE_SERIES}" ]; then
-    new_iso_name_current="${IMAGENAME}-${DIST}-${NEONARCHIVE}-${TYPE}-current"
+    new_iso_name_current="${IMAGENAME}-${DIST}-${NEONARCHIVE}-${EDITION}-current"
 else
-    new_iso_name_current="${IMAGENAME}-${NEONARCHIVE}-${TYPE}-current"
+    new_iso_name_current="${IMAGENAME}-${NEONARCHIVE}-${EDITION}-current"
 fi
 
 ln -s $new_iso_name_timestamped.iso $new_iso_name_current.iso