diff options
5 files changed, 21 insertions, 3 deletions
diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt index 3f0e3bff..d5ea0090 100644 --- a/jessie-amd64-jenkins-master/plugins.txt +++ b/jessie-amd64-jenkins-master/plugins.txt @@ -19,7 +19,7 @@ docker-slaves:1.0.7 dropdown-viewstabbar-plugin:1.7 dynamic-axis:1.0.3 ec2:1.39 -email-ext:2.62 +email-ext:2.63 embeddable-build-status:1.9 extended-choice-parameter:0.76 extended-read-permission:2.0 @@ -34,7 +34,7 @@ htmlpublisher:1.16 ircbot:2.30 jdk-tool:1.1 jira:3.0.0 -jenkins-multijob-plugin:1.30 +jenkins-multijob-plugin:1.31 jobConfigHistory:2.18 ldap:1.20 leastload:2.0.1 @@ -43,7 +43,7 @@ matrix-auth:2.3 matrix-combinations-parameter:1.3.0 matrixtieparent:1.2 mercurial:1.61 -metrics:3.1.2.12 +metrics:4.0.2.2 monitoring:1.73.1 multiple-scms:0.6 naginator:1.17.2 diff --git a/tcwg-base/home-data/maxim.kuvyrkov/.ssh/ssh-tcwglab-nc.sh b/tcwg-base/home-data/maxim.kuvyrkov/.ssh/ssh-tcwglab-nc.sh new file mode 120000 index 00000000..6eddeb50 --- /dev/null +++ b/tcwg-base/home-data/maxim.kuvyrkov/.ssh/ssh-tcwglab-nc.sh @@ -0,0 +1 @@ +../../tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh
\ No newline at end of file diff --git a/tcwg-base/home-data/tcwg-benchmark/.ssh/ssh-tcwglab-nc.sh b/tcwg-base/home-data/tcwg-benchmark/.ssh/ssh-tcwglab-nc.sh new file mode 120000 index 00000000..6eddeb50 --- /dev/null +++ b/tcwg-base/home-data/tcwg-benchmark/.ssh/ssh-tcwglab-nc.sh @@ -0,0 +1 @@ +../../tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh
\ No newline at end of file diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/config b/tcwg-base/home-data/tcwg-buildslave/.ssh/config index 1b8fb405..140ad7e0 100644 --- a/tcwg-base/home-data/tcwg-buildslave/.ssh/config +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/config @@ -16,6 +16,10 @@ Host *.tcwglab *.aus-colo people.linaro.org aus-colo.linaro.org lab.validation.l Host *proxy.* ProxyCommand ssh $(echo %h | sed -e "s/proxy\.//") nc -q0 localhost %p +# Access to Cambridge Lab. E.g., ssh dev-01.tcwglab +Host *.tcwglab + ProxyCommand ssh-tcwglab-nc.sh -q0 %h %p + # Access to Austin Colo. E.g., "ssh r1-a7.aus-colo" Host *.aus-colo ProxyCommand ssh aus-colo.linaro.org nc -q0 %h %p @@ -50,6 +54,9 @@ Host *.tcwglab *.aus-colo *.lab tcwg-d05-01 libgomp-d05 tcwg-thx1-01 # Don't warn about "adding" host keys to /dev/null LogLevel FATAL +Host ci.linaro.org + Port 2020 + Host git.linaro.org dev-private-git.linaro.org User git diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh b/tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh new file mode 100755 index 00000000..24038b50 --- /dev/null +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +if ip addr show 2>&1 | grep -q "inet 192\.168\.1[678]\."; then + # If we are in one of TCWG Cambridge subnetworks, then use straight nc. + exec nc "$@" +else + # Otherwise jump from ci.linaro.org + exec ssh -Snone ci.linaro.org nc "$@" +fi |