[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: more changes for Profitbricks rename to IONOS
Holger Levsen
gitlab at salsa.debian.org
Thu Oct 29 17:46:40 GMT 2020
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
2315057b by Holger Levsen at 2020-10-29T18:46:29+01:00
reproducible: more changes for Profitbricks rename to IONOS
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
3 changed files:
- bin/reproducible_html_nodes_info.sh
- bin/reproducible_maintenance.sh
- bin/reproducible_system_health.sh
Changes:
=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -17,10 +17,10 @@ common_init "$@"
explain_nodes() {
case $JENKINS_NODENAME in
jenkins) ;;
- profitbricks3) write_page "<br /><small>(twitterbot for irc:#reproducible-builds)</small>" ;;
- profitbricks7) write_page "<br /><small>(buildinfos.debian.net)</small>" ;;
- profitbricks9) write_page "<br /><small>(jenkins.d.n rebootstrap jobs)</small>" ;;
- profitbricks10) write_page "<br /><small>(jenkins.d.n chroot-installation jobs and http-proxy)</small>" ;;
+ ionos3) write_page "<br /><small>(twitterbot for irc:#reproducible-builds)</small>" ;;
+ ionos7) write_page "<br /><small>(buildinfos.debian.net)</small>" ;;
+ ionos9) write_page "<br /><small>(jenkins.d.n rebootstrap jobs)</small>" ;;
+ ionos10) write_page "<br /><small>(jenkins.d.n chroot-installation jobs and http-proxy)</small>" ;;
osuosl167) write_page "<br /><small>(Debian janitor and http-proxy for osuosl nodes)</small>" ;;
osuosl168) write_page "<br /><small>(r-b F-Droid builds)</small>" ;;
osuosl169) write_page "<br /><small>(r-b Alpine, Archlinux builds)</small>" ;;
@@ -29,7 +29,7 @@ explain_nodes() {
osuosl172) write_page "<br /><small>(r-b OpenWrt, Coreboot builds)</small>" ;;
osuosl173) write_page "<br /><small>(r-b Debian / Archlinux rebuilder)</small>" ;;
osuosl174) write_page "<br /><small>(r-b openSUSE)</small>" ;;
- profitbricks1) write_page "<br /><small>(r-b Debian builds and http-proxy)</small>" ;;
+ ionos1) write_page "<br /><small>(r-b Debian builds and http-proxy)</small>" ;;
codethink16) write_page "<br /><small>(r-b Debian builds and http-proxy)</small>" ;;
*) write_page "<br /><small>(r-b Debian builds)</small>" ;;
esac
@@ -88,7 +88,12 @@ build_nodes_health_page() {
NODE="jenkins.debian.net"
else
case $ARCH in
- amd64|i386) JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1-2|sed 's#-build##' ) ;;
+ amd64|i386) if [ "${NODE:0:5}" = "ionos" ] ; then
+ JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1)
+ else # osuosl-build...
+ JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1-2|sed 's#-build##' )
+ fi
+ ;;
arm64) JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1-2|sed 's#-sled##' ) ;;
armhf) JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1) ;;
esac
@@ -116,10 +121,10 @@ build_nodes_health_page() {
# worker.log links
case $JENKINS_NODENAME in
jenkins) write_page "<td></td>" ;;
- profitbricks3) write_page "<td></td>" ;;
- profitbricks7) write_page "<td></td>" ;;
- profitbricks9) write_page "<td></td>" ;;
- profitbricks10) write_page "<td></td>" ;;
+ ionos3) write_page "<td></td>" ;;
+ ionos7) write_page "<td></td>" ;;
+ ionos9) write_page "<td></td>" ;;
+ ionos10) write_page "<td></td>" ;;
osuosl*) write_page "<td></td>" ;;
*) write_page "<td>"
SHORTNAME=$(echo $NODE | cut -d '.' -f1)
@@ -134,10 +139,10 @@ build_nodes_health_page() {
for SUITE in ${SUITES} ; do
case $JENKINS_NODENAME in
jenkins) write_page "<td></td>" ;;
- profitbricks3) write_page "<td></td>" ;;
- profitbricks7) write_page "<td></td>" ;;
- profitbricks9) write_page "<td></td>" ;;
- profitbricks10) write_page "<td></td>" ;;
+ ionos3) write_page "<td></td>" ;;
+ ionos7) write_page "<td></td>" ;;
+ ionos9) write_page "<td></td>" ;;
+ ionos10) write_page "<td></td>" ;;
osuosl*) write_page "<td></td>" ;;
*) URL="https://jenkins.debian.net/view/reproducible/view/Debian_setup_${ARCH}/job/reproducible_setup_pbuilder_${SUITE}_${ARCH}_${JENKINS_NODENAME}"
BADGE="$URL/badge/icon"
@@ -210,7 +215,12 @@ build_graph_overview_pages() {
NODE="jenkins.debian.net"
else
case $ARCH in
- amd64|i386) JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1-2|sed 's#-build##' ) ;;
+ amd64|i386) if [ "${NODE:0:5}" = "ionos" ] ; then
+ JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1)
+ else # osuosl-build...
+ JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1-2|sed 's#-build##' )
+ fi
+ ;;
arm64) JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1-2|sed 's#-sled##' ) ;;
armhf) JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1) ;;
esac
@@ -222,10 +232,10 @@ build_graph_overview_pages() {
if [ "$GRAPH" = "jenkins_reproducible_builds" ] ; then
case $JENKINS_NODENAME in
jenkins) write_page "<td></td>" ; continue ;;
- profitbricks3) write_page "<td></td>" ; continue ;;
- profitbricks7) write_page "<td></td>" ; continue ;;
- profitbricks9) write_page "<td></td>" ; continue ;;
- profitbricks10) write_page "<td></td>" ; continue ;;
+ ionos3) write_page "<td></td>" ; continue ;;
+ ionos7) write_page "<td></td>" ; continue ;;
+ ionos9) write_page "<td></td>" ; continue ;;
+ ionos10) write_page "<td></td>" ; continue ;;
osuosl*) write_page "<td></td>" ; continue ;;
*) ;;
esac
=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -190,10 +190,10 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then
case $NODE_ARCH in
amd64)
case "$NODE_ALIAS" in
- (profitbricks*) NODE="ionos${NODE_ALIAS#profitbricks}-amd64.debian.net" ;;
- (osuosl*) NODE="osuosl-build${NODE_ALIAS#osuosl}-amd64.debian.net" ;;
+ ionos*) NODE="$NODE_ALIAS-amd64.debian.net" ;;
+ osuosl*) NODE="osuosl-build${NODE_ALIAS#osuosl}-amd64.debian.net" ;;
esac ;;
- i386) NODE="ionos${NODE_ALIAS#profitbricks}-i386.debian.net" ;;
+ i386) NODE="$NODE_ALIAS-i386.debian.net" ;;
arm64) NODE="codethink-sled${NODE_ALIAS#codethink}-arm64.debian.net" ;;
armhf) NODE="${NODE_ALIAS}-armhf-rb.debian.net" ;;
esac
=====================================
bin/reproducible_system_health.sh
=====================================
@@ -96,10 +96,10 @@ for JOB_NAME in $(ls -1d reproducible_* | sort ) ; do
case $NODE_ARCH in
amd64)
case "$NODE_ALIAS" in
- (profitbricks*) NODE="ionos${NODE_ALIAS#profitbricks}-amd64.debian.net" ;;
- (osuosl*) NODE="osuosl-build${NODE_ALIAS#osuosl}-amd64.debian.net" ;;
+ ionos*) NODE="$NODE_ALIAS-amd64.debian.net" ;;
+ osuosl*) NODE="osuosl-build${NODE_ALIAS#osuosl}-amd64.debian.net" ;;
esac ;;
- i386) NODE="ionos${NODE_ALIAS#profitbricks}-i386.debian.net" ;;
+ i386) NODE="$NODE_ALIAS-i386.debian.net" ;;
arm64) NODE="codethink-sled${NODE_ALIAS#codethink}-arm64.debian.net" ;;
armhf) NODE="${NODE_ALIAS}-armhf-rb.debian.net" ;;
esac
@@ -239,16 +239,16 @@ for JOB_NAME in $(ls -1d reproducible_* | sort ) ; do
fi
case $JOB_NAME in
reproducible_maintenance_amd64_jenkins) MODIFIER=250 ;; # main node
- reproducible_maintenance_amd64_profitbricks1) MODIFIER=500 ;; # proxy for other nodes
- reproducible_maintenance_amd64_profitbricks10) MODIFIER=500 ;; # proxy for other nodes
+ reproducible_maintenance_amd64_ionos1) MODIFIER=500 ;; # proxy for other nodes
+ reproducible_maintenance_amd64_ionos10) MODIFIER=500 ;; # proxy for other nodes
reproducible_maintenance_amd64_*) MODIFIER=20 ;;
reproducible_maintenance_i386_*) MODIFIER=10 ;;
reproducible_maintenance_arm64_codethink16) MODIFIER=500 ;; # proxy for other nodes
reproducible_maintenance_arm64_*) MODIFIER=10 ;;
reproducible_maintenance_armhf_*) MODIFIER=3 ;;
reproducible_node_health_check_amd64_jenkins) MODIFIER=150 ;;
- reproducible_node_health_check_amd64_profitbricks1) MODIFIER=150 ;;
- reproducible_node_health_check_amd64_profitbricks10) MODIFIER=150 ;;
+ reproducible_node_health_check_amd64_ionos1) MODIFIER=150 ;;
+ reproducible_node_health_check_amd64_ionos10) MODIFIER=150 ;;
reproducible_node_health_check_amd64_*) MODIFIER=20 ;;
reproducible_node_health_check_i386_*) MODIFIER=10 ;;
reproducible_node_health_check_arm64_codethink16) MODIFIER=150 ;;
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/2315057b2b220d75ef96b3b0827fe3b08cb9c7de
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/2315057b2b220d75ef96b3b0827fe3b08cb9c7de
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/20201029/608f791e/attachment-0001.html>
More information about the Qa-jenkins-scm
mailing list