[Git][qa/jenkins.debian.net][master] jenkins nodes: use ionos4+14 as dedicated http(s)-proxies for ionos nodes. Closes: #988191
Holger Levsen (@holger)
gitlab at salsa.debian.org
Sat Apr 20 21:33:49 BST 2024
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
da9063ad by Holger Levsen at 2024-04-20T22:33:10+02:00
jenkins nodes: use ionos4+14 as dedicated http(s)-proxies for ionos nodes. Closes: #988191
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
20 changed files:
- TODO.infrastructure
- bin/common-functions.sh
- bin/reproducible_html_nodes_info.sh
- hosts/ionos1-amd64/etc/apt/apt.conf.d/80proxy
- hosts/ionos10-amd64/etc/apt/apt.conf.d/80proxy
- − hosts/ionos10-amd64/etc/cron-apt/config
- hosts/ionos11-amd64/etc/apt/apt.conf.d/80proxy
- hosts/ionos12-i386/etc/apt/apt.conf.d/80proxy
- hosts/ionos10-amd64/etc/squid/squid.conf → hosts/ionos14-amd64/etc/squid/squid.conf
- hosts/ionos15-amd64/etc/apt/apt.conf.d/80proxy
- hosts/ionos16-i386/etc/apt/apt.conf.d/80proxy
- hosts/ionos2-i386/etc/apt/apt.conf.d/80proxy
- hosts/ionos3-amd64/etc/apt/apt.conf.d/80proxy
- hosts/ionos1-amd64/etc/squid/squid.conf → hosts/ionos4-amd64/etc/squid/squid.conf
- hosts/ionos5-amd64/etc/apt/apt.conf.d/80proxy
- hosts/ionos6-i386/etc/apt/apt.conf.d/80proxy
- hosts/ionos9-amd64/etc/apt/apt.conf.d/80proxy
- hosts/jenkins/etc/apt/apt.conf.d/80proxy
- − hosts/jenkins/etc/cron-apt/config
- update_jdn.sh
Changes:
=====================================
TODO.infrastructure
=====================================
@@ -19,12 +19,9 @@ amd64 is now often build (i1+5+11+16, but not infom1+2) with cpu variation: once
turn SSD based swap on ionos1+5+11+15 into hdd based one
check /srv/workspace (tmpfs or not) on all ionos nodes and all nodes in general
also, our pbuilderc is setup to only use eatmydata on armhf+i386 - because amd64+arm64 build on tmpfs anyway (which is not true anymore...)
-setup ionos4 as proxy for fkb, has 2 cores, 12gb ram, 152gb hdd (24 swap, rest root fs, allow 100gb for /var/spool/squid)
-setup ionos14 as proxy for fra, has 2 cores, 12gb ram, 152gb hdd (24 swap, rest root fs, allow 100gb for /var/spool/squid)
- fixup index_nodes_health
- setup swap
- setup squid
- make ionos systems use these proxies and disable to old ones
+setup ionos4 as proxy for fkb, has 2 cores, 12gb ram, 152gb hdd (12gb swap, rest root fs, allow 100gb for /var/spool/squid)
+setup ionos14 as proxy for fra, has 2 cores, 12gb ram, 152gb hdd (12gb swap, rest root fs, allow 100gb for /var/spool/squid)
+ remove squid on 1+10 after 24h (update_jdn pkg & munin plugins)
add ionos4+14 to THANKS
mv jenkins:/dev/vda1 to SDD, free 500gb hdd space
increase to 640gb? more partitions?
=====================================
bin/common-functions.sh
=====================================
@@ -120,12 +120,12 @@ else
fi
# force http_proxy as we want it
case $HOSTNAME in
- jenkins|ionos1-a*|ionos2*|ionos9*|ionos11*|ionos12*|ionos4*)
- # IONOS datacenter in karlsruhe uses ionos1 as proxy:
- export http_proxy="http://78.137.99.97:3128" ;;
- ionos5*|ionos6*|ionos7*|ionos10*|ionos15*|ionos16*|ionos14*)
- # IONOS datacenter in frankfurt uses ionos10 as proxy:
- export http_proxy="http://85.184.249.68:3128" ;;
+ jenkins|ionos1-a*|ionos2*|ionos4*|ionos9*|ionos11*|ionos12*)
+ # IONOS datacenter in karlsruhe uses ionos4 as proxy:
+ export http_proxy="http://46.16.76.132:3128" ;;
+ ionos5*|ionos6*|ionos7*|ionos10*|ionos14*|ionos15*|ionos16*)
+ # IONOS datacenter in frankfurt uses ionos14 as proxy:
+ export http_proxy="http://213.165.73.152:3128" ;;
osuosl*)
# all nodes at OSUOSL use themself as proxy:
export http_proxy="http://127.0.0.1:3128" ;;
=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -19,15 +19,14 @@ explain_nodes() {
jenkins) ;;
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>" ;;
+ ionos10) write_page "<br /><small>(jenkins.d.n chroot-installation jobs)</small>" ;;
osuosl1) write_page "<br /><small>(r-b Alpine, Archlinux, Coreboot, NetBSD, OpenWrt builds)</small>" ;;
osuosl2) write_page "<br /><small>(r-b Alpine, Archlinux, Coreboot, OpenWrt builds)</small>" ;;
osuosl3) write_page "<br /><small>(r-b Debian live-build / bootstrap jobs and Debian janitor jobs, mmdebstrap-jenkins jobs and openqa.d.n workers</small>" ;;
osuosl4) write_page "<br /><small>(r-b snapshot development)</small>" ;;
osuosl5) write_page "<br /><small>(r-b rebuilder-snapshot.debian.net)</small>" ;;
- ionos1) write_page "<br /><small>(r-b Debian builds and http-proxy)</small>" ;;
- codethink04) write_page "<br /><small>(r-b Debian builds and http-proxy)</small>" ;;
- ionos*4) write_page "<br /><small>(r-b http(s) proxy)</small>" ;;
+ codethink04) write_page "<br /><small>(r-b Debian builds and http(s)-proxy)</small>" ;;
+ ionos*4) write_page "<br /><small>(r-b http(s)-proxy)</small>" ;;
*) write_page "<br /><small>(r-b Debian builds)</small>" ;;
esac
}
=====================================
hosts/ionos1-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://78.137.99.97:3128";
+Acquire::http::Proxy "http://46.16.76.132:3128";
=====================================
hosts/ionos10-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://85.184.249.68:3128";
+Acquire::http::Proxy "http://213.165.73.152:3128";
=====================================
hosts/ionos10-amd64/etc/cron-apt/config deleted
=====================================
@@ -1,4 +0,0 @@
-# Configuration for cron-apt. For further information about the possible
-# configuration settings see /usr/share/doc/cron-apt/README.gz.
-
-MAILON="upgrade"
=====================================
hosts/ionos11-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://78.137.99.97:3128";
+Acquire::http::Proxy "http://46.16.76.132:3128";
=====================================
hosts/ionos12-i386/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://78.137.99.97:3128";
+Acquire::http::Proxy "http://46.16.76.132:3128";
=====================================
hosts/ionos10-amd64/etc/squid/squid.conf → hosts/ionos14-amd64/etc/squid/squid.conf
=====================================
@@ -979,6 +979,7 @@ acl localnet src 85.184.249.130/32 # ionos5
acl localnet src 213.244.192.14/32 # ionos6
acl localnet src 157.97.110.83/32 # ionos7
acl localnet src 85.184.249.68/32 # ionos10
+acl localnet src 213.165.73.152/32 # ionos14
acl localnet src 157.97.110.46/32 # ionos15
acl localnet src 217.160.216.137/32 # ionos16
#acl localnet src fc00::/7 # RFC 4193 local private network range
@@ -3450,7 +3451,7 @@ maximum_object_size 153600 KB
# Uncomment and adjust the following to add a disk cache directory.
#cache_dir ufs /var/spool/squid 100 16 256
-cache_dir ufs /var/spool/squid 16384 16 1024
+cache_dir ufs /var/spool/squid 102400 16 1024
# TAG: store_dir_select_algorithm
# How Squid selects which cache_dir to use when the response
=====================================
hosts/ionos15-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://85.184.249.68:3128";
+Acquire::http::Proxy "http://213.165.73.152:3128";
=====================================
hosts/ionos16-i386/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://85.184.249.68:3128";
+Acquire::http::Proxy "http://213.165.73.152:3128";
=====================================
hosts/ionos2-i386/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://78.137.99.97:3128";
+Acquire::http::Proxy "http://46.16.76.132:3128";
=====================================
hosts/ionos3-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://85.184.249.68:3128";
+Acquire::http::Proxy "http://213.165.73.152:3128";
=====================================
hosts/ionos1-amd64/etc/squid/squid.conf → hosts/ionos4-amd64/etc/squid/squid.conf
=====================================
@@ -978,6 +978,7 @@ acl localnet src 10.0.0.0/8 # RFC1918 possible internal network
acl localnet src 46.16.76.207/32 # jenkins
acl localnet src 78.137.99.97/32 # ionos1
acl localnet src 46.16.73.166/32 # ionos2
+acl localnet src 46.16.76.132/32 # ionos4
acl localnet src 46.16.78.222/32 # ionos9
acl localnet src 78.137.101.155/32 # ionos11
acl localnet src 46.16.73.168/32 # ionos12
@@ -3450,7 +3451,7 @@ maximum_object_size 153600 KB
# Uncomment and adjust the following to add a disk cache directory.
#cache_dir ufs /var/spool/squid 100 16 256
-cache_dir ufs /var/spool/squid 16384 16 1024
+cache_dir ufs /var/spool/squid 102400 16 1024
# TAG: store_dir_select_algorithm
# How Squid selects which cache_dir to use when the response
=====================================
hosts/ionos5-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://85.184.249.68:3128";
+Acquire::http::Proxy "http://213.165.73.152:3128";
=====================================
hosts/ionos6-i386/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://85.184.249.68:3128";
+Acquire::http::Proxy "http://213.165.73.152:3128";
=====================================
hosts/ionos9-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://78.137.99.97:3128";
+Acquire::http::Proxy "http://46.16.76.132:3128";
=====================================
hosts/jenkins/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://78.137.99.97:3128";
+Acquire::http::Proxy "http://46.16.76.132:3128";
=====================================
hosts/jenkins/etc/cron-apt/config deleted
=====================================
@@ -1,4 +0,0 @@
-# Configuration for cron-apt. For further information about the possible
-# configuration settings see /usr/share/doc/cron-apt/README.gz.
-
-MAILON="upgrade"
=====================================
update_jdn.sh
=====================================
@@ -408,12 +408,14 @@ if [ -f /etc/debian_version ] ; then
esac
# install squid / apache2 on a few nodes only
case $HOSTNAME in
- ionos1-a*|ionos10*|codethink04*|osuosl*) DEBS="$DEBS
+ ionos4*|ionos14*|codethink04*|osuosl*) DEBS="$DEBS
squid" ;;
ionos7-a*) DEBS="$DEBS
dehydrated
dehydrated-apache2
apache2" ;;
+ #ionos1-a*|ionos10*) DEBS="$DEBS
+ # squid-" ;;
*) ;;
esac
# for josch's mmdebstrap-jenkins-worker
@@ -553,7 +555,6 @@ if [ -f /etc/debian_version ] ; then
botch
build-essential
cmake
- cron-apt
csvtool
dehydrated
dehydrated-apache2
@@ -730,7 +731,7 @@ if ! $UP2DATE || [ $BASEDIR/hosts/$HOSTNAME/etc/munin -nt $STAMP ] ; then
# delete some everywhere
sudo rm -f postfix_* open_inodes interrupts irqstats threads proc_pri vmstat if_err_* exim_* netstat fw_forwarded_local fw_packets fw_conntrack forks open_files users nfs* ntp* df_abs entropy http_loadtime
case $HOSTNAME in
- ionos1-a*|ionos10*|codethink04*|osuosl*) [ -L /etc/munin/plugins/squid_cache ] || for i in squid_cache squid_objectsize squid_requests squid_traffic ; do sudo ln -s /usr/share/munin/plugins/$i $i ; done ;;
+ ionos4*|ionos14*|ionos1-a*|ionos10*|codethink04*|osuosl*) [ -L /etc/munin/plugins/squid_cache ] || for i in squid_cache squid_objectsize squid_requests squid_traffic ; do sudo ln -s /usr/share/munin/plugins/$i $i ; done ;;
*) ;;
esac
case $HOSTNAME in
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/da9063ad40c9ca0f89718c420ef479f2bfe3f31c
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/da9063ad40c9ca0f89718c420ef479f2bfe3f31c
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/20240420/408eba97/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list