[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: refactoring

[Holger Levsen]

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


Commits:
d1f082a8 by Holger Levsen at 2020-10-30T23:08:47+01:00
refactoring

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

- - - - -
c3127da2 by Holger Levsen at 2020-10-30T23:10:49+01:00
refactoring

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

- - - - -


2 changed files:

- bin/reproducible_html_nodes_info.sh
- bin/reproducible_system_health.sh


Changes:

=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -87,16 +87,7 @@ build_nodes_health_page() {
 				JENKINS_NODENAME=jenkins
 				NODE="jenkins.debian.net"
 			else
-				case $ARCH in
-					amd64|i386) 	if [ "${NODE:0:5}" = "ionos" ] ; then
-								JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1)
-							else # osuosl...
-								JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1-2|sed 's#-build##' )
-							fi
-							;;
-					arm64) 		JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1) ;;
-					armhf) 		JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1) ;;
-				esac
+				JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1)
 			fi
 			write_page "<tr><td>$JENKINS_NODENAME"
 			explain_nodes
@@ -214,16 +205,7 @@ build_graph_overview_pages() {
 					JENKINS_NODENAME=jenkins
 					NODE="jenkins.debian.net"
 				else
-					case $ARCH in
-						amd64|i386) 	if [ "${NODE:0:5}" = "ionos" ] ; then
-									JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1)
-								else # osuosl...
-									JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1-2|sed 's#-build##' )
-								fi
-								;;
-						arm64) 		JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1) ;;
-						armhf) 		JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1) ;;
-					esac
+					JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1)
 				fi
 				write_page "<tr><td>$JENKINS_NODENAME"
 				explain_nodes


=====================================
bin/reproducible_system_health.sh
=====================================
@@ -93,16 +93,7 @@ for JOB_NAME in $(ls -1d reproducible_* | sort ) ; do
 	esac
 	if $REMOTE ; then
 		# the dns names are different than the jenkins names...
-		case $NODE_ARCH in
-			amd64)
-				case "$NODE_ALIAS" in
-					ionos*)		NODE="$NODE_ALIAS-amd64.debian.net" ;;
-					osuosl*)	NODE="osuosl${NODE_ALIAS#osuosl}-amd64.debian.net" ;;
-				esac ;;
-			i386)	NODE="$NODE_ALIAS-i386.debian.net" ;;
-			arm64)	NODE="$NODE_ALIAS-arm64.debian.net" ;;
-			armhf)	NODE="$NODE_ALIAS-armhf-rb.debian.net" ;;
-		esac
+		NODE="$NODE_ALIAS-amd64.debian.net"
 		# ignore jobs on known bad nodes:
 		# check the offline list from git (and the one updated by jenkins)
 		# as this should only ignore nodes humans (and not jenkins) have



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/957da0b51813a989f5bc3649d10377bdb43ddad9...c3127da28b5921bb5c81e0a06a4be00948b19ad3

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/957da0b51813a989f5bc3649d10377bdb43ddad9...c3127da28b5921bb5c81e0a06a4be00948b19ad3
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/20201030/acd787f8/attachment-0001.html>