[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: jenkins shell monitor: allow 40gb of diffoscope files for experimental as Debian is frozen atm

[Holger Levsen (@holger)]

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


Commits:
7e83620d by Holger Levsen at 2023-04-03T18:20:04+02:00
jenkins shell monitor: allow 40gb of diffoscope files for experimental as Debian is frozen atm

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

- - - - -
d3f32d2d by Holger Levsen at 2023-04-03T18:23:07+02:00
djm: only ask for confirmation on potentially destructive actions

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

- - - - -


2 changed files:

- bin/djm
- bin/jenkins-shell-monitor.sh


Changes:

=====================================
bin/djm
=====================================
@@ -21,6 +21,7 @@ ACTION=$2
 REASON=$3
 DRY_RUN=$4
 FAIL_REASON=""
+CONFIRM=false
 
 if [ -z "$TARGET" ] ; then
 	FAIL_REASON="${FAIL_REASON}Undefined target.\n"
@@ -37,8 +38,8 @@ if [ -z "$TARGET" ] ; then
 fi
 
 case $ACTION in
-	r|reboot)	ACTION=reboot ;;
-	p|powercycle)	ACTION=powercycle ;;
+	r|reboot)	ACTION=reboot 		;	CONFIRM=true	;;
+	p|powercycle)	ACTION=powercycle 	;	CONFIRM=true	;;
 	a|autoremove)	ACTION=autoremove ;;
 	s|shell)	ACTION=shell ;;
 	*)		FAIL_REASON="${FAIL_REASON}Undefined action.\n"
@@ -97,7 +98,7 @@ if $DRY_MODE ; then
 	echo "###  running in dry-run mode, not doing anything for real."
 	echo "###"
 	echo "###"
-else
+elif $CONFIRM ; then
 	echo
 	echo Please confirm you want to do this:
 	echo
@@ -112,7 +113,7 @@ if $DRY_MODE ; then
 	echo
 	echo "# dry-run end."
 	exit 0
-else
+elif $CONFIRM ; then
 	echo
 	echo -n "confirm: y/N: "
 	read CONFIRM


=====================================
bin/jenkins-shell-monitor.sh
=====================================
@@ -23,7 +23,7 @@ WARNING_LEVEL['r-b-userContent../dbd*/buster']=5
 WARNING_LEVEL['r-b-userContent../dbd*/bullseye']=40
 WARNING_LEVEL['r-b-userContent../dbd*/bookworm']=60
 WARNING_LEVEL['r-b-userContent../dbd*/unstable']=140
-WARNING_LEVEL['r-b-userContent../dbd*/experimental']=30
+WARNING_LEVEL['r-b-userContent../dbd*/experimental']=40	# 30 outside freezes
 
 # prepare a trap for cleaning up
 # using a global tempfile



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/988d3ac3fd42f698654296f350d009e7cb57d585...d3f32d2d2b63ec13c842e3beb815ab32b7d6c70b

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/988d3ac3fd42f698654296f350d009e7cb57d585...d3f32d2d2b63ec13c842e3beb815ab32b7d6c70b
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/20230403/47de96d5/attachment-0001.htm>