[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] drop jenkins-test-vm as it has been obsoleted
Holger Levsen
gitlab at salsa.debian.org
Wed Apr 14 21:30:56 BST 2021
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
e15d188a by Holger Levsen at 2021-04-14T22:30:10+02:00
drop jenkins-test-vm as it has been obsoleted
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
5 changed files:
- bin/common-functions.sh
- bin/jenkins_master_wrapper.sh
- hosts/ionos1-amd64/etc/squid/squid.conf
- hosts/jenkins/etc/munin/munin.conf
- job-cfg/d-i.yaml.py
Changes:
=====================================
bin/common-functions.sh
=====================================
@@ -115,7 +115,7 @@ else
if [ "${MIRROR+x}" != "x" ] ; then
case $HOSTNAME in
- jenkins|jenkins-test-vm|ionos*|osuosl*)
+ jenkins|ionos*|osuosl*)
export MIRROR=http://cdn-fastly.deb.debian.org/debian ;;
bbx15|cb3*|cbxi4*|wbq0|odxu4*|odu3*|odc*|ff*|ff4*|opi2*|jt?1*|p64*|virt32[a-z]|virt64[a-z])
export MIRROR=http://cdn-fastly.deb.debian.org/debian ;;
@@ -129,7 +129,7 @@ else
fi
# force http_proxy as we want it
case $HOSTNAME in
- jenkins|jenkins-test-vm|ionos1-a*|ionos2*|ionos9*|ionos11*|ionos12*)
+ jenkins|ionos1-a*|ionos2*|ionos9*|ionos11*|ionos12*)
# IONOS datacenter in karlsruhe uses ionos1 as proxy:
export http_proxy="http://78.137.99.97:3128" ;;
ionos3*|ionos5*|ionos6*|ionos7*|ionos10*|ionos15*|ionos16*)
=====================================
bin/jenkins_master_wrapper.sh
=====================================
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set noexpandtab:
-# Copyright 2015-2019 Holger Levsen <holger at layer-acht.org>
+# Copyright 2015-2021 Holger Levsen <holger at layer-acht.org>
# 2016 Phil Hands <phil at hands.com>
# 2018 Mattia Rizzolo <mattia at debian.org>
# released under the GPLv2
@@ -10,12 +10,6 @@
set -u
set -e
-# don't try to run on test system
-if [ "$HOSTNAME" = "jenkins-test-vm" ] ; then
- echo "$(date -u) - running on $HOSTNAME, exiting successfully and cleanly immediatly."
- exit 0
-fi
-
# define Debian build nodes in use
. /srv/jenkins/bin/jenkins_node_definitions.sh
=====================================
hosts/ionos1-amd64/etc/squid/squid.conf
=====================================
@@ -976,7 +976,6 @@ acl localnet src 10.0.0.0/8 # RFC1918 possible internal network
#acl localnet src 172.16.0.0/12 # RFC1918 possible internal network
#acl localnet src 192.168.0.0/16 # RFC1918 possible internal network
acl localnet src 46.16.76.207/32 # jenkins
-acl localnet src 78.137.97.249/32 # jenkins-test-vm
acl localnet src 78.137.99.97/32 # ionos1
acl localnet src 46.16.73.166/32 # ionos2
acl localnet src 46.16.78.222/32 # ionos9
=====================================
hosts/jenkins/etc/munin/munin.conf
=====================================
@@ -729,18 +729,6 @@ contact.me.command mail -s "Munin notification ${var:host}" root
diskstats_utilization.graph no
diskstats_iops.graph no
-[jenkins-test-vm.debian.net]
- address 46.16.73.145
- use_node_name yes
- cpu.graph_args --base 1000 -r --lower-limit 0 # also graph values about current limit (eg from when the machine had more cores)
- df._srv_workspace.warning 75
- df._srv_workspace.critical 85
- diskstats_latency.vda.avgwrwait.warning 0:20
- diskstats_latency.vda.avgrdwait.warning 0:10
- diskstats_latency.graph no
- diskstats_throughput.graph no
- diskstats_utilization.graph no
-
[rb-mail1.reproducible-builds.org]
address rb-mail1.reproducible-builds.org
@@ -785,5 +773,5 @@ contact.me.command mail -s "Munin notification ${var:host}" root
# node_order Totals fii.foo.com fay.foo.com
#
[debian.net;]
- node_order jenkins.debian.net ionos1-amd64.debian.net ionos2-i386.debian.net ionos3-amd64.debian.net ionos5-amd64.debian.net ionos6-i386.debian.net ionos7-amd64.debian.net ionos9-amd64.debian.net ionos10-amd64.debian.net ionos11-amd64.debian.net ionos12-i386.debian.net ionos15-amd64.debian.net ionos16-i386.debian.net osuosl167-amd64.debian.net osuosl168-amd64.debian.net osuosl169-amd64.debian.net osuosl170-amd64.debian.net osuosl171-amd64.debian.net osuosl172-amd64.debian.net osuosl173-amd64.debian.net osuosl174-amd64.debian.net codethink9-arm64.debian.net codethink10-arm64.debian.net codethink11-arm64.debian.net codethink12-arm64.debian.net codethink13-arm64.debian.net codethink14-arm64.debian.net codethink15-arm64.debian.net codethink16-arm64.debian.net bbx15-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net cb3a-armhf-rb.debian.net ff2a-armhf-rb.debian.net ff2b-armhf-rb.debian.net ff4a-armhf-rb.debian.net ff64a-armhf-rb.debian.net odxu4a-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odu3a-armhf-rb.debian.net jtk1a-armhf-rb.debian.net jtk1b-armhf-rb.debian.net jtx1a-armhf-rb.debian.net jtx1b-armhf-rb.debian.net jtx1c-armhf-rb.debian.net opi2a-armhf-rb.debian.net opi2c-armhf-rb.debian.net p64b-armhf-rb.debian.net p64c-armhf-rb.debian.net virt32a-armhf-rb.debian.net virt32b-armhf-rb.debian.net virt64a-armhf-rb.debian.net virt64b-armhf-rb.debian.net wbq0-armhf-rb.debian.net freebsd-jenkins.debian.net jenkins-test-vm.debian.net
+ node_order jenkins.debian.net ionos1-amd64.debian.net ionos2-i386.debian.net ionos3-amd64.debian.net ionos5-amd64.debian.net ionos6-i386.debian.net ionos7-amd64.debian.net ionos9-amd64.debian.net ionos10-amd64.debian.net ionos11-amd64.debian.net ionos12-i386.debian.net ionos15-amd64.debian.net ionos16-i386.debian.net osuosl167-amd64.debian.net osuosl168-amd64.debian.net osuosl169-amd64.debian.net osuosl170-amd64.debian.net osuosl171-amd64.debian.net osuosl172-amd64.debian.net osuosl173-amd64.debian.net osuosl174-amd64.debian.net codethink9-arm64.debian.net codethink10-arm64.debian.net codethink11-arm64.debian.net codethink12-arm64.debian.net codethink13-arm64.debian.net codethink14-arm64.debian.net codethink15-arm64.debian.net codethink16-arm64.debian.net bbx15-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net cb3a-armhf-rb.debian.net ff2a-armhf-rb.debian.net ff2b-armhf-rb.debian.net ff4a-armhf-rb.debian.net ff64a-armhf-rb.debian.net odxu4a-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odu3a-armhf-rb.debian.net jtk1a-armhf-rb.debian.net jtk1b-armhf-rb.debian.net jtx1a-armhf-rb.debian.net jtx1b-armhf-rb.debian.net jtx1c-armhf-rb.debian.net opi2a-armhf-rb.debian.net opi2c-armhf-rb.debian.net p64b-armhf-rb.debian.net p64c-armhf-rb.debian.net virt32a-armhf-rb.debian.net virt32b-armhf-rb.debian.net virt64a-armhf-rb.debian.net virt64b-armhf-rb.debian.net wbq0-armhf-rb.debian.net freebsd-jenkins.debian.net
=====================================
job-cfg/d-i.yaml.py
=====================================
@@ -164,10 +164,6 @@ jobs = [
'{name}_build-group',
]
-if "jenkins-test-vm" == os.uname()[1]:
- pkgs = ['debian-installer', 'preseed', 'debootstrap', 'debian-installer-utils', 'rootskel']
- jobs = ['{name}_build-group']
-
desc_str = {
'html': (
'Builds the {langname} html version of the installation-guide '
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/e15d188a1be1b75a8b43cfb7611933c8238fc367
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/e15d188a1be1b75a8b43cfb7611933c8238fc367
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/20210414/f532e8af/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list