[Git][qa/jenkins.debian.net][master] 2 commits: update_jdn: fix harmless typo

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
3ce66fe1 by Holger Levsen at 2023-10-28T13:07:53+02:00
update_jdn: fix harmless typo

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
b01c710c by Holger Levsen at 2023-10-28T13:08:48+02:00
reproducible Debian: start dealing with fallout from #1054898

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- bin/reproducible_setup_pbuilder.sh
- update_jdn.sh


Changes:

=====================================
bin/reproducible_setup_pbuilder.sh
=====================================
@@ -152,7 +152,12 @@ setup_pbuilder() {
 		pbuilder_http_proxy="--http-proxy $http_proxy"
 	fi
 	# setup base.tgz
-	sudo pbuilder --create $pbuilder_http_proxy --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE --debootstrapopts --no-merged-usr --extrapackages "$EXTRA_PACKAGES" --loglevel D	# no-usrmerge is called no-merged-usr here, else things would be too simple
+	case $SUITE in
+		buster|bookworm|bullseye)	sudo pbuilder --create $pbuilder_http_proxy --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE --debootstrapopts --no-merged-usr --extrapackages "$EXTRA_PACKAGES" --loglevel D	# no-usrmerge is called no-merged-usr here, else things would be too simple
+			;;
+		*)				sudo pbuilder --create $pbuilder_http_proxy --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE --debootstrapopts --extrapackages "$EXTRA_PACKAGES" --loglevel D
+			;;
+	esac
 
 	# customize pbuilder
 	create_customized_tmpfile ${TMPFILE}


=====================================
update_jdn.sh
=====================================
@@ -59,7 +59,7 @@ explain "$(date) - begin deployment update."
 
 # some nodes run in the future and need special treatment…
 case $HOSTNAME in
-	ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386|codethink01*|codethink03**)
+	ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386|codethink01*|codethink03*)
 		# set correct date
 		set_correct_date de.pool.ntp.org
 		;;



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/d41fdb63f3b90303d746770204cdec386482f93b...b01c710c70069b9d7dd1cfdf6b4fe61da2fc6520

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/d41fdb63f3b90303d746770204cdec386482f93b...b01c710c70069b9d7dd1cfdf6b4fe61da2fc6520
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20231028/01f12fbd/attachment-0001.htm>