[Git][qa/jenkins.debian.net][master] 2 commits: bin/d-i_check_jobs: Update hints
Holger Levsen (@holger)
gitlab at salsa.debian.org
Mon Jul 13 12:59:37 BST 2026
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
484b9642 by Roland Clobus at 2026-07-13T13:59:19+02:00
bin/d-i_check_jobs: Update hints
Some time ago the source moved to the generator 'd-i.yaml.py'
(cherry picked from commit c067d2054b2b53c0dabc52e53e0430df2e821e08)
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
f8fdba8d by Roland Clobus at 2026-07-13T13:59:23+02:00
d-i.yaml.py: Make d-i_check_jenkins_jobs pass
* Add the missing language hi
* Add the missing git modules
(cherry picked from commit 9837ea505a7d48bf3135e81301a1739ae3c0d396)
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
2 changed files:
- bin/d-i_check_jobs.sh
- job-cfg/d-i.yaml.py
Changes:
=====================================
bin/d-i_check_jobs.sh
=====================================
@@ -20,19 +20,27 @@ FAIL=false
DI_BUILD_JOB_PATTERN=d-i_build_
DI_MANUAL_JOB_PATTERN=d-i_manual_
TMPFILE=$(mktemp)
-JOB_TEMPLATES=$(mktemp)
-PROJECT_JOBS=$(mktemp)
+MISSING_NON_PO_LANGS=$(mktemp)
+MISSING_LANGS=$(mktemp)
+MISSING_PROJECTS=$(mktemp)
CLEANUP=$(mktemp)
#
# check for missing d-i package build jobs
# for this, we compare referred git repos in .mrconfig against locally existing jenkins jobs
-# (see http://wiki.debian.org/DebianInstaller/CheckOut)
+# (see https://wiki.debian.org/DebianInstaller/CheckOut)
#
echo
echo "Scanning $URL for referred git repos which have no jenkins job associated."
curl $URL > $TMPFILE 2>/dev/null
-PACKAGES=$( grep salsa.debian.org/installer-team $TMPFILE|cut -d "/" -f6-|cut -d " " -f1)
+# Expected pattern:
+# [.]
+# checkout = git clone https://salsa.debian.org/installer-team/d-i.git .
+#
+# [packages/anna]
+# checkout = git clone https://salsa.debian.org/installer-team/anna.git
+#
+PACKAGES=$( grep salsa.debian.org/installer-team $TMPFILE|cut -d "/" -f5-|cut -d " " -f1|cut -d "." -f1)
#
# check for each git repo if a jenkins job exists
#
@@ -47,11 +55,7 @@ for PACKAGE in $PACKAGES ; do
#
# prepare yaml bits
#
- echo " - '{name}_build_$PACKAGE':" >> $PROJECT_JOBS
- echo " gitrepo: 'https://salsa.debian.org/installer-team/$PACKAGE'" >> $PROJECT_JOBS
- echo "- job-template:" >> $JOB_TEMPLATES
- echo " defaults: d-i-build" >> $JOB_TEMPLATES
- echo " name: '{name}_build_$PACKAGE'" >> $JOB_TEMPLATES
+ echo "${PACKAGE}" >> $MISSING_PROJECTS
else
echo "Ok: Job '${DI_BUILD_JOB_PATTERN}${PACKAGE}' exists."
fi
@@ -66,10 +70,10 @@ for JOB in $(ls -1 ~jenkins/jobs/ | grep ${DI_BUILD_JOB_PATTERN}) ; do
if grep -q https://salsa.debian.org/installer-team/$REPONAME $TMPFILE ; then
if grep -A 1 https://salsa.debian.org/installer-team/$REPONAME $TMPFILE | grep -q "deleted = true" ; then
echo "Warning: Job $JOB exists, but has 'deleted = true' set in .mrconfig."
- if ! grep -q "'https://salsa.debian.org/installer-team/$REPONAME'" /srv/jenkins/job-cfg/d-i.yaml ; then
+ if ! grep -q "'https://salsa.debian.org/installer-team/$REPONAME'" /srv/jenkins/job-cfg/d-i.yaml.py ; then
echo "jenkins-jobs delete $JOB" >> $CLEANUP
else
- echo "# Please remove $JOB from job-cfg/d-i.yaml before deleting the job." >> $CLEANUP
+ echo "# Please remove $JOB from job-cfg/d-i.yaml.py before deleting the job." >> $CLEANUP
fi
else
echo "Ok: Job $JOB for https://salsa.debian.org/installer-team/$REPONAME found."
@@ -117,12 +121,10 @@ for DIRECTORY in * ; do
#
# prepare yaml bits
#
- echo " - '{name}_manual_${DIRECTORY}_${FORMAT}':" >> $PROJECT_JOBS
- echo " lang: '$DIRECTORY'" >> $PROJECT_JOBS
- echo " languagename: 'FIXME: $DIRECTORY'" >> $PROJECT_JOBS
- echo "- job-template:" >> $JOB_TEMPLATES
- echo " defaults: d-i-manual-${FORMAT}" >> $JOB_TEMPLATES
- echo " name: '{name}_manual_${DIRECTORY}_${FORMAT}'" >> $JOB_TEMPLATES
+ echo " {'${DIRECTORY}': {'langname': 'FIXME'}}," >> $MISSING_LANGS
+ echo "${DIRECTORY}" >> $MISSING_NON_PO_LANGS
+ else
+ echo "Found build job '${DI_MANUAL_JOB_PATTERN}${DIRECTORY}_${FORMAT}'."
fi
done
fi
@@ -158,12 +160,7 @@ for DIRECTORY in * ; do
#
# prepare yaml bits - po2xml jobs just use different defaults
#
- echo " - '{name}_manual_${DIRECTORY}_${FORMAT}':" >> $PROJECT_JOBS
- echo " lang: '$DIRECTORY'" >> $PROJECT_JOBS
- echo " languagename: 'FIXME: $DIRECTORY'" >> $PROJECT_JOBS
- echo "- job-template:" >> $JOB_TEMPLATES
- echo " defaults: d-i-manual-${FORMAT}-po2xml" >> $JOB_TEMPLATES
- echo " name: '{name}_manual_${DIRECTORY}_${FORMAT}'" >> $JOB_TEMPLATES
+ echo " {'${DIRECTORY}': {'langname': 'FIXME'}}," >> $MISSING_LANGS
else
echo "Found build job '${DI_MANUAL_JOB_PATTERN}${DIRECTORY}_${FORMAT}'."
fi
@@ -178,14 +175,24 @@ echo
if $FAIL ; then
figlet "Missing jobs!"
echo
- echo "Add these job templates to job-cfg/d-i.yaml:"
- cat $JOB_TEMPLATES
- echo
- echo
- echo "Append this to the project definition in job-cfg/d-i.yaml:"
- cat $PROJECT_JOBS
- echo
- rm -f $JOB_TEMPLATES $PROJECT_JOBS $CLEANUP
+ if [ -s $MISSING_NON_PO_LANGS ]; then
+ echo "Append this to the variable non_po_langs in job-cfg/d-i.yaml.py:"
+ sort -u $MISSING_NON_PO_LANGS
+ echo
+ echo
+ fi
+ if [ -s $MISSING_PROJECTS ]; then
+ echo "Append this to the variable pkgs in job-cfg/d-i.yaml.py:"
+ sort -u $MISSING_PROJECTS
+ echo
+ echo
+ fi
+ if [ -s $MISSING_LANGS ]; then
+ echo "Append this to the variable langs in job-cfg/d-i.yaml.py:"
+ sort -u $MISSING_LANGS
+ echo
+ fi
+ rm -f $MISSING_NON_PO_LANGS $MISSING_PROJECTS $MISSING_LANGS $CLEANUP
exit 1
elif [ -s $CLEANUP ] ; then
echo
@@ -193,7 +200,7 @@ elif [ -s $CLEANUP ] ; then
echo
cat $CLEANUP
echo
- echo "Jobs need to be deleted from job-cfg/d-i.yaml first, before deleting them with jenkins-jobs, cause else they will be recreated and then builds will be attempted, which will fail and cause notifications..."
+ echo "Jobs need to be deleted from job-cfg/d-i.yaml.py first, before deleting them with jenkins-jobs, cause else they will be recreated and then builds will be attempted, which will fail and cause notifications..."
else
echo "Everything ok."
fi
=====================================
job-cfg/d-i.yaml.py
=====================================
@@ -23,6 +23,7 @@ langs = [
{'es': {'langname': 'Spanish'}},
{'fi': {'langname': 'Finnish'}},
{'fr': {'langname': 'French'}},
+ {'hi': {'langname': 'Hindi'}},
{'hu': {'langname': 'Hungarian'}},
{'id': {'langname': 'Indonesian'}},
{'it': {'langname': 'Italian'}},
@@ -57,6 +58,7 @@ anna
apt-setup
arcboot-installer
base-installer
+blendsel
bterm-unifont
babelbox
busybox
@@ -74,15 +76,20 @@ debian-installer-netboot-images
debian-installer-utils
debian-installer
debootstrap
+depthcharge-tools-installer
desktop-chooser
devicetype-detect
dh-di
+d-i
+discover
+discover-data
efi-reader
elilo-installer
finish-install
flash-kernel
grub-installer
hw-detect
+installation-guide
installation-locale
installation-report
iso-scan
@@ -116,9 +123,11 @@ partman-base
partman-basicfilesystems
partman-basicmethods
partman-btrfs
+partman-cros
partman-crypto
partman-efi
partman-ext3
+partman-hfs
partman-iscsi
partman-jfs
partman-lvm
@@ -144,6 +153,8 @@ s390-dasd
s390-netdevice
s390-sysconfig-writer
s390-zfcp
+systemd-boot-installer
+tasksel
tzsetup
udpkg
usb-discover
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/bc1bbe548c8dd12d142df93055f7c949f01fdac9...f8fdba8d5af95d2b36c775776f327429b37278de
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/bc1bbe548c8dd12d142df93055f7c949f01fdac9...f8fdba8d5af95d2b36c775776f327429b37278de
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20260713/76f0f090/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list