From 70943e01d971fd86c1daceb3787bfa9c13a65975 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Tue, 7 Aug 2018 11:10:05 +0000 Subject: tcwg-base: Add ability to ssh to *.tcwglab machines via ci.linaro.org Add ssh-tcwglab-nc.sh script to avoid the overhead of ssh'ing through Germany-based ci.linaro.org when both machines are inside Cambridge Lab. Change-Id: I1434f3215344e7aa2adbc99eb14a6592009ce8fa --- tcwg-base/home-data/maxim.kuvyrkov/.ssh/ssh-tcwglab-nc.sh | 1 + tcwg-base/home-data/tcwg-benchmark/.ssh/ssh-tcwglab-nc.sh | 1 + tcwg-base/home-data/tcwg-buildslave/.ssh/config | 7 +++++++ tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh | 9 +++++++++ 4 files changed, 18 insertions(+) create mode 120000 tcwg-base/home-data/maxim.kuvyrkov/.ssh/ssh-tcwglab-nc.sh create mode 120000 tcwg-base/home-data/tcwg-benchmark/.ssh/ssh-tcwglab-nc.sh create mode 100755 tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh 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 -- cgit v1.2.3 From af962689afb3904feda0c8da2c482d0c8220f363 Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Tue, 7 Aug 2018 14:39:53 +0300 Subject: jenkins: update plugins Change-Id: I07b91eaaf9a2d06648c805258614d9aaf8055ef3 Signed-off-by: Fathi Boudra --- jessie-amd64-jenkins-master/plugins.txt | 6 +++--- 1 file changed, 3 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 -- cgit v1.2.3 From e83a713d1d50325abd5aecfb44f95a94a4fa04ee Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Wed, 8 Aug 2018 16:20:30 +0000 Subject: tcwg-host: Add docker-stats helper to pretty-print containers. Change-Id: I070bf9df40c0c341e44b359bb2e722f60fa051ee --- tcwg-base/tcwg-host/Dockerfile.in | 1 + tcwg-base/tcwg-host/build.sh | 5 +++-- tcwg-base/tcwg-host/docker-wrapper | 2 +- xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile | 3 ++- xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tcwg-base/tcwg-host/Dockerfile.in b/tcwg-base/tcwg-host/Dockerfile.in index 8d219ba1..cb6e235e 100644 --- a/tcwg-base/tcwg-host/Dockerfile.in +++ b/tcwg-base/tcwg-host/Dockerfile.in @@ -1,6 +1,7 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} COPY docker-wrapper /usr/local/bin/docker +COPY docker-stats /usr/local/bin/ COPY run.sh start.sh / diff --git a/tcwg-base/tcwg-host/build.sh b/tcwg-base/tcwg-host/build.sh index f18f3752..6205035d 100755 --- a/tcwg-base/tcwg-host/build.sh +++ b/tcwg-base/tcwg-host/build.sh @@ -6,7 +6,7 @@ trap cleanup_exit INT TERM EXIT cleanup_exit() { - rm -rf docker-wrapper run.sh start.sh + rm -rf docker-stats docker-wrapper run.sh start.sh } export LANG=C @@ -16,7 +16,8 @@ name=$(basename ${PWD} | cut -f3- -d '-') image=linaro/ci-${arch}-${name}-ubuntu:${distro} top=$(git rev-parse --show-toplevel) -cp $top/tcwg-base/tcwg-host/docker-wrapper \ +cp $top/tcwg-base/tcwg-host/docker-stats \ + $top/tcwg-base/tcwg-host/docker-wrapper \ $top/tcwg-base/tcwg-host/run.sh \ $top/tcwg-base/tcwg-host/start.sh ./ diff --git a/tcwg-base/tcwg-host/docker-wrapper b/tcwg-base/tcwg-host/docker-wrapper index 883a8038..2cfea5c9 100755 --- a/tcwg-base/tcwg-host/docker-wrapper +++ b/tcwg-base/tcwg-host/docker-wrapper @@ -1,2 +1,2 @@ #!/bin/sh -sudo /usr/bin/docker "$@" +exec sudo /usr/bin/docker "$@" diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile index ba5cd020..48b28d26 100644 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile @@ -2,9 +2,10 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial COPY docker-wrapper /usr/local/bin/docker +COPY docker-stats /usr/local/bin/ COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 476d3063728acd718302d2d7bad5e711 +# checksum: 9f94a8be2756ffabb6ebafa75127f228 diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile index 22a4ea80..34f161bd 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile @@ -2,9 +2,10 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial COPY docker-wrapper /usr/local/bin/docker +COPY docker-stats /usr/local/bin/ COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 16cc73e3d44c8ab0cae45ab9cf83ab32 +# checksum: 8498aac781566adf4cb5a246369137bd -- cgit v1.2.3 From 3935d77fd7693cf57d726ae6229c0387377e0f35 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Wed, 8 Aug 2018 16:26:51 +0000 Subject: tcwg-llvmbot: Remove handling of APMs and add handling of linaro-thx1-01 Change-Id: Ibd256fe442bef9790b7302a446fd6ec56846ac02 --- tcwg-base/tcwg-llvmbot/start.sh | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/tcwg-base/tcwg-llvmbot/start.sh b/tcwg-base/tcwg-llvmbot/start.sh index 18e5fa50..38ee277b 100755 --- a/tcwg-base/tcwg-llvmbot/start.sh +++ b/tcwg-base/tcwg-llvmbot/start.sh @@ -39,21 +39,6 @@ case "$buildmaster" in masterurl="$buildmaster" esac -case "$mastername:$slavename:$(hostname):$image" in - # No restrictions for custom masters: - custom:*:*:*) ;; - # Almost no restrictions for the silent master: - silent:*:linaro-armv8-*:*) ;; - silent:*:r*-a*:*) ;; - # Restrictions for the normal master: - normal:linaro-armv8-*-arm-*:linaro-armv8-*:*-armhf-*) ;; - normal:linaro-armv8-*-aarch64-*:linaro-armv8-*:*-arm64-*) ;; - normal:*:r*-a*:*-arm64-*) ;; - *) - usage "ERROR: Wrong mastername:slavename:hostname:image combination: $mastername:$slavename:$(hostname):$image" - ;; -esac - # Set relative CPU weight of containers running silent bots to 1/20th of # normal containers. We want to run a full set of silent bots for # troubleshooting purposes, but don't want to waste a lot of CPU cycles. @@ -62,19 +47,8 @@ case "$mastername" in *) cpu_shares=1000 ;; esac -case "$slavename" in - linaro-armv8-*) - # Use 64G out of 128G. - memlimit="64" - ;; - *) - # Use at most 30G or 90% of all RAM. - memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') * 9 / 10)) - if [ "$memlimit" -gt "30" ]; then - memlimit="30" - fi - ;; -esac +# Use 64G out of 128G. +memlimit="64" case "$slavename" in *-lld) pids_limit="15000" ;; -- cgit v1.2.3 From 83411f402c519b8d090b5aace4948f4d2689fd8c Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Wed, 8 Aug 2018 16:52:35 +0000 Subject: tcwg-llvmbot: Remove mentions of APMs. Change-Id: I443dd52239f5f2cbbdea33fbeb79b5b681d8fa4b --- tcwg-base/tcwg-llvmbot/run.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tcwg-base/tcwg-llvmbot/run.sh b/tcwg-base/tcwg-llvmbot/run.sh index 272df643..aec8e31b 100755 --- a/tcwg-base/tcwg-llvmbot/run.sh +++ b/tcwg-base/tcwg-llvmbot/run.sh @@ -6,8 +6,6 @@ bare_metal_bot_p () { case "$1" in "linaro-tk1-"*) return 0 ;; - "linaro-apm-02"|"linaro-apm-05") return 1 ;; - "linaro-apm-"*) return 0 ;; *) return 1 ;; esac } @@ -20,8 +18,8 @@ use_clang_p () # Typically we've used clang when the default gcc has problems # otherwise gcc is used. case "$1" in - *-libcxx*|linaro-tk1-01|linaro-apm-03) return 0 ;; - *-lld|linaro-apm-04) return 0 ;; + *-libcxx*|linaro-tk1-01) return 0 ;; + *-lld) return 0 ;; *-arm-quick|linaro-tk1-06) return 0 ;; *-arm-full-selfhost|linaro-tk1-05) return 0 ;; *-arm-full|linaro-tk1-08) return 0 ;; @@ -88,7 +86,7 @@ EOF chmod +x /usr/local/bin/c++ case "$2" in - *-lld|linaro-apm-04) + *-lld) # LLD buildbot needs to find ld.lld for stage1 build. GCC does not # support -fuse-ld=lld. ln -f -s /usr/bin/ld.bfd /usr/local/bin/ld.lld @@ -104,8 +102,8 @@ EOF n_cores=$(nproc --all) case "$2" in - linaro-apm-*) hw="APM Mustang ${n_cores}-core X-Gene" ;; linaro-armv8-*) hw="${n_cores}-core ARMv8 provided by Packet.net (Type 2A2)" ;; + linaro-thx1-*) hw="${n_cores}-core ThunderX1 provided by Packet.net (Type 2A)" ;; linaro-tk1-*) hw="NVIDIA TK1 ${n_cores}-core Cortex-A15" ;; esac -- cgit v1.2.3 From ac215e412e180d38081b02d78713ebf2b44ffb9a Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Wed, 8 Aug 2018 17:37:28 +0000 Subject: tcwg-host: Add missing file Change-Id: I94007dbcfc385248c59bc6eb3dca593b69980a66 --- tcwg-base/tcwg-host/docker-stats | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 tcwg-base/tcwg-host/docker-stats diff --git a/tcwg-base/tcwg-host/docker-stats b/tcwg-base/tcwg-host/docker-stats new file mode 100755 index 00000000..e981aa5a --- /dev/null +++ b/tcwg-base/tcwg-host/docker-stats @@ -0,0 +1,3 @@ +#!/bin/sh + +exec watch docker stats --no-stream --format "\"table {{.Name}}\\t{{.CPUPerc}}\\t{{.PIDs}}\\t{{.MemPerc}}\\t{{.MemUsage}}\"" -- cgit v1.2.3 From e9632d71f3c164ce8d7d468d441eb09fbb1fc60a Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 9 Aug 2018 06:57:59 +0000 Subject: tcwg-base: Fix typo in tcwg-buildslave's .ssh/config Change-Id: Ie3ad8ea9768d987c92eccefbd981c22b9074d565 --- tcwg-base/home-data/tcwg-buildslave/.ssh/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/config b/tcwg-base/home-data/tcwg-buildslave/.ssh/config index 140ad7e0..ba32e1ef 100644 --- a/tcwg-base/home-data/tcwg-buildslave/.ssh/config +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/config @@ -18,7 +18,7 @@ Host *proxy.* # Access to Cambridge Lab. E.g., ssh dev-01.tcwglab Host *.tcwglab - ProxyCommand ssh-tcwglab-nc.sh -q0 %h %p + ProxyCommand ~/.ssh/ssh-tcwglab-nc.sh -q0 %h %p # Access to Austin Colo. E.g., "ssh r1-a7.aus-colo" Host *.aus-colo -- cgit v1.2.3 From 9a15d8b58e07a4f7f85968c9ec895cb4fbc9164c Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 9 Aug 2018 13:39:36 +0000 Subject: tcwg-base: Update known_hosts to include ci.linaro.org:2020 ( hosts=" ex40-01.tcwglab.linaro.org aus-colo.linaro.org lab.validation.linaro.org people.linaro.org git.linaro.org git-us.linaro.org dev-private-git.linaro.org review.linaro.org dev-private-review.linaro.org " ssh-keyscan -t rsa,dsa,ecdsa $hosts hosts=" review.linaro.org dev-private-review.linaro.org " ssh-keyscan -p29418 -t rsa,dsa,ecdsa $hosts hosts=" ci.linaro.org " ssh-keyscan -p2020 -t rsa,dsa,ecdsa $hosts ) | sort -u > tcwg-buildslave/.ssh/known_hosts Change-Id: Id185530e1a7968f0707b516a78d8b6569e1fd7cd --- tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts b/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts index b649d65f..a1a108b4 100644 --- a/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts @@ -1,9 +1,12 @@ aus-colo.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP8apVdw/JC+4rOiq/eG2LgjwJPCqKIlG/RwPVDe1VNOdtrmR6VnTQ5oQYkwt00h2rdI6dVzdW8Q9za7PGW6Sls= aus-colo.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBALdjDe/FnDjKDz+QzKWD/J1jIVVjied+1EFcxZ/uyGw9uZwVjReHP6ehGQCtQEM+SDklOXc6bz9UeBjG6+gDGXWBmldbS2yXvvxFmmbOf40h/rVFKq0CW/tJxyONoaf75Qj+aOyo3iUXMl+jJowb+LR5j0zbdTrSkM2qEsP8o0b3AAAAFQDfNOi88rFXdks5xpzmiKs0fzyYGQAAAIEAnzYTZ0dDAua6FHgqfoNVZHS4CV/le6G5FFCc4Kp4lB9ijRMjrDZNey5BkCooetqOBuPF8mYYAgZ28NemIUvvTenddfHFzWQTPl0meAdUhBW4EJMq0HWEV+kUKANUah2QlXWx8/g1x3cOhBzABTMOEBUFnlMx9d5A71JZypEN5UQAAACACiH996M1x/DjYmMp6BLwglYMDjQPrfI7QhNwa/8/wukDHlB6puB/HdPyxYZp/IVShHze6C3YpmV+dXxc85/vMNoVRx02ICC2gTkm2MoSFgaW1nO95tRPtyJ4AXa4ev4D22hNPF5SxgXfn2lT4uH8bWxvTrzgHs7JhAzD0oRbOh4= aus-colo.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCg5vMfuBLRroqEb6+CFLQikh1Wq6UD++SODY7bSdPDfN1wmurdp60AdVU+22nOXgK78mwYPJ0PEcTBMSE+OmryfZFDZm/+aPbALid/vFs8NuvFmEQ8vecEBPDGxJ3RpVxkNG5BrWMTJjWMJTCFdIh9my5vhBPEloAuDRthRNaRwvgqRw3GJAbSG2Cg4ZgOQi7Lv3ogQ/M3nXzy8KMp4KD7AtncylguPoVwDxNwjl+YoEujZDvpM4UiZDnh+Gxeru3EnEIgDvwbMizlrKL8Tm+2gA+j3cWkgIjCVJM+PW8V0aobp681ChqlbDlzK0oVmwUafdVv3dxzOSrjQH2rkaOn +[ci.linaro.org]:2020 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJW1L7ZeT7dC/otESvOQl8KZ/VlV08z0rmUPwwVJvDbuAlh6Qpn5LVPRe7IFEU/qePQQEKzn1Kw7x6Ces3e5mck= +[ci.linaro.org]:2020 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzIJCEw5MSW713q3I95jORM6fkdx22Z+eeanVvAy8fGssvh0QHZtG8kpesQLWmtaOxkkRwURK+ui4OnoO/FCaRGWX0SUpnHxPF23OcwejLGXX9uAhtFY8s2hyvdrWDyB4vGjNjqT8NhnciETy3WNV0D0tKCfwEy6WkjIM0B9acrDxhYYDLqSXWUBAdJ7J8Mgg/L1nAPWM8DC0H+5SmzYvfxxnzprq/EvLDL950262WN10nzx2KsFD0zCW4eggp2Qcqa5XX6Ou/gHfIW8J8gncOjfpR4c6DN9NS7rX71F7BsLhkMwu1GwKhf09qvtGT3LdR2ilNOG36Uvq7WksiBofr dev-private-git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs= dev-private-git.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK10xjDXtqiW6S02TFvIQUmjTyu+tpiT0IVTp5dlZX5rT1EDi4DtRgtoO/R4WncAs0GE8FqaI/IqljuYlJbHOrFCxU3OWKB+z2Ue3oXs3kouoFP3coF4exBZLEBX4JQ/HI5Ii88fnE/U70/+wN/mMAtcOrsgGWGXOv8yFZEQaKJJAAAAFQCfVbaD5KdaABTLwQ8CXRuZ+PAeHwAAAIBmppcf9sx9M4KAgiOQRGW+7/eImJHFRazQSe8Qbiqo0H7OQhIRcLIm6+PAtKgxxSaQErAo4z/xM7d2lhqOyydK5GDpILgV3qHUFAgQ9vajL+ga5/VeRTqg6R91kYgIKnEl3y8/iW6eRcJF/jzYfDcaFG0Z3gsOtHzjTsCuV8KMLwAAAIBupI2LDTsUYa64hSKvGhEVPMj8VKx5RX4NWQU/dlNNhlFRTzV42giujZ146vH5SGqagR3daX+o6Xm++GDJ+AedzJ8zBc9dAwU7ao4fd23bsyURvNxC7K5DKJnlCDS6xk+6wv6Hz9VdbaIEE5TPxSGqZEOK1V+pbgv+cMUGACy43Q== dev-private-git.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC34bjTOKJIq8MVSeC5gddQlbR0hyvvTZbrpW7KXgCzkLTFZxa05wbz8VC1l7ruPotQBgrICgLYmrbjrASqcY//9OPLDa1Pf/MUIu2F2lA1W/5E3psGYmyC9GTvmjKgu39Rad5ujXMeMLjuzVPCmo+WhewgugDSV4Fcggd6B6YXHGtoE15ctSw4moerUq1+2BXVgFxUyMoGcpSCeLnbvWpmi6xWoGQOSnrQ4Z/VmZ5WZ87vQsiiWEAsqmMOHHacunnSph7uzQXJlHNajdeGnr2NF+EgcmQ0N6vivZDRLmRYuSmizjCOHSRZxSm/0UJC/ewVzp9BwRepiNKWsjb4gTMb +[dev-private-review.linaro.org]:29418 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDZ6AQ2WyZSO43657/fFpxGgVY73kUwh1R1eXpZp27T6lAI5XFQ7YS8HjQ2O7e4edGSpJHHrqVuZphKpqu11Lz8= [dev-private-review.linaro.org]:29418 ssh-dss AAAAB3NzaC1kc3MAAACBAM596jW8Kbsh/ApdoP3r7UvrSOzhnoG1ZHYngER+Dd9e0iGJY1Wbpth7ngngpALl3PQQ99R5xUt8wvcOcICq+vF34FR/Gym+7VjaMLI7DxF48OrUAJnx6zINNlpXbMAI0nptWcKoL/xdmC7AoBOjH1Q+jGTiKISmXTE1w5iK8qp3AAAAFQDwzizM3qhYdknasNV/vp84o19FWQAAAIEAqLjr9vNsgr1snOdyKOhRuyidqf/zThaxuJaUktxLDKU0DDip+FGqLYiS2VzNuSWMaKjkBjITBi0sXktmUhhbPvBHhyzLy3Hz6BOdXpUAoq70QMOcocE9IsEfmqtkOsx/BZ1uCV6W051Gsci4PxK16q9zolpAEp4/3wEWGH+ueJIAAACAERdZ+vCZl6iDzq6XpYFKZ1r6i/CjX5KIBWKCzoN/Z8fo96rZqFA23G5tXM8+YMYnLdwb/qvNSCz6dWpH2FMS4yj7zo2l3GjguC8JOfar0Rt8fihJyaynX+rD/aP3b+h5ot1b/645qrfvpfmeh3gZt3c1kjy5fyopujyGNTUtq6c= [dev-private-review.linaro.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCofUDWYYwzE4YWotCffwCxLoRuVCMb6DP+eObwbTPHMe5asK94Y1jPNeK1yUVJIuIAUO8aA6pIq3uLKlusyGLZe1YBpM+7YX3HMOBfCOeOemHFxETlj/HC7islYLYT7Sm/DweiN1kxgP8Q/PhPIA5czCZGHS/+T/VLbMApyyzdTmswaqfgJejyK9juHAcmxT3Tupj2SGOuOamyKfhfsPxGwIchivy/mt7xBTk5cNiSDeLAfMn2rHsilfLjb+IoeE6EvtqG3+rTh+ttulHp2vSeZkK79tuyVWt+XOZjD4RDfk1taW9JjaafkyOW0VCF4gqOMfJU24u88xTCgqkgT1bN dev-private-review.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs= @@ -18,11 +21,11 @@ git-us.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdH git-us.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== git-us.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV lab.validation.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFZDLd4f9cph9A64+kXUpGvuRmInB3HAtHU9T6wVIsp4HkYLLZD59I4lF/u2VLfM7j10XMNPO7ybOJMM+1zIZlM= -lab.validation.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK75t/OG68cN0mtVNrliCi8/7tajozJQDGvxgnpben1F84IzWNJpBdtEgaXeo3zD0cQl1nM5IftBjSKMkomdsaDh7u6A57juaANU9NKIXW2BGmaICZxllFAb/Cmnq4mDnZJ33G5UyGPVA49bUEKw8DLe8FLVlO/wcghJhjoy7prZAAAAFQD8zrwLDwd4M4vKKWu9nju7fI3oywAAAIBVE6ykor/q56qYTYqaAvcRkq7331jdYHTqiAVcO9KyrdOS7yCgtb2Dw+O0rq5ftLSF73ad5ACbw+XbzQVJAeKDaDs5mLf3eYF0+3YODFRHYDsbbihO0uZcGHFPvGDD9odBZhWFIZaFSdboodSuyzxIgLu0EZAsHoSP2wjTGdiXFwAAAIAkPcANYxo0jm8BuCEYR+SXXS4aj83dUGbPP54UU7M+jrrfG1M+JVFh3kEsXr9zptZajY+NrqlnXqPp4HZyORUUEN+Szkjbd2p8CCCQvv1PODGJtXFzwpatUP27I2ik/lZG9OXxBQkO+QxjuJ+pcjXPdBRz6DwWoUM63+QFXBLpsw== lab.validation.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtto5bsPJ3NuXsWtwMR8bsAzLvkBstmF1QP+eC6jUBsCDHMtBW/zAWJYNPDr30vRkV7J8D64Pd91rgjbqF8mOPDlyVlln03dYtOV3hzVuXLZfxodslJsw4lB+ZhxLfcZAKqqFURJEhrJNJmtFBprxFRbdS1iQHJHJohg3zS9zlLFvUpZGWooLFEM2z2NdUfSiR12ePvdW1YsEimJR/b3h1it/Wot0uEB6VONZGyMrrWvsntJV1NdQFxJR8waTz1sBvQQBJGX+SgEXY1CB3AUiF4yIy5WZ/4YCOk0kO9qABvV0Ks357OU5uY5GMgalAy2RJyvceNf6erlR4vwmpdnDH people.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKKtlH9IGVw1wE3daicRzyOdIM9MzWfUH1tUB8R/md36RDTSqG8VGYrn1E5pJcs7rsk05ZCUQIaglefMytoOvQ8= people.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAOnQwFbvISNteLPMb/Srm2xwFDrxDql+kxtlZyohrSZ72K9GDg+dqb4W7/QiVrOMhfRzaL93Hj/FLCxKqUXdnTQqekqGosRQK7fLNJvh6DNizoJ+aWzKp1EL3kF2GgKP33ZPtRJYrBdxnc+DDc0yP/He3cyrzbg1nsWSedc1MMVpAAAAFQCm3xIrM1iR9ozuyjKRGwhnrKo9GQAAAIBkdN4dNB298m+2aXqMmLOj1Ry9/S6CTiMn5c9T/luYpWFRnsyuHlBIcZFjyOMtU3bc8b7KwqP8t3XTQbolbqtYOWqPeiaIH/VAk7w9o1tePRwtbTadksYw+UJGtn9c+52uQfGZdjfyjsKs7hEWgE72gTeIb9g1QZ+WCoVfSzNacgAAAIA9T2ONJcRFX3heeDcl6gho8Wj264GDhS5/iqdMCClO3wKUY04hPSpXKRhRm/zzFGb9537Qj6LluDAcg+m/D0FnoQkILLXnfiMnrlyoCCA/jZWrVZw8aQdDHM5LlDdDZKZV7djkbjF0nVvWRTrvc20yQeDLLImaTDOfYjmJ75L1vQ== people.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8OveP3mffvlzMEGuZQzol8zoDwCdAzrNiBfX9rv6lDGr86Sl4MVKs/6cYdjbtrUJD7ls5gc8cfjH5EXPh/HuoBj7Bi+UNfyyGSqrZgTFPpyLx50QJDeogcUN54NL+N/X6HtQtyvGwEXgb26S9ec7LFfyxqT8Yy370XH/y7qAtJgS3UTkf8kzIWgZQvU5MU3FqhOn9mzI+KqsBMRKt0JpW7H2VRYiaHqpshwpuNHRDEQBMnRVHDpo8SZRq21pwRjdTzuzGJv2enCW018jWC/HMmTaaDWzX6SO+JQs9NFVUpM6hg+ysa5piDXnCNQ8Ry6l0nlAjgUt92NEe4OeANrt9 +[review.linaro.org]:29418 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPzkmW4axU/BXRtRkR42I8FVvWjGhB4CUtTC3cSkhu6L0Oo9i+ija/hahkPT0DC+S0k/vEL7s4mC5SrdNCeJO/0= [review.linaro.org]:29418 ssh-dss AAAAB3NzaC1kc3MAAACBAPB0SE19HQ0dEtm3Unp7+JiNeHlIWNs4j9yN+2Q/fxmBT2ZZ0a5I4gg63b5rM/1Li/6k0f/CtSYBH/mhmjKaEKIQV/c/lmuZivUAfTPT0ld3voXHwRhgpWI/WOiRdsTRZZW2yUHx/troO53mx4eIISKfab+t+vCU5Af+sgTBF6InAAAAFQDGR2ccfQSWVuSyzgvK8f7FT8olTQAAAIBHZqySRfjEnnx9h0aS6i2H21dmZxUllwIJpdpS6XWzvMzVwBb1DKx8bO0WwZeTnxxs1BKVAjmSDkDGYJWHxyU8kQ8aFsBo0KwbNEKXozaK3Gf2YF289xQsigbtPUWYXDz1PNEXtIS9AXdCRq4i09ujO3ayxq4lX2n0LIQ4IhM+RgAAAIB2SvnzVadjW14AN9F9ZEfnK0JRpBTKjz+kQSS1TJiRI/dSHG6CwwXjD1G9YW8mfGhPOPYHIE2MF2n7d7DfqBdeeee0PnwBQ0YBc5qfhQ9Gpi+hqXSem1YaD2YRG40que5bu/Rd6NksnSLg/93Z3L3fN+qTeApRqHQWRrfswGgi+A== [review.linaro.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMfTLkTmsbtahAiVJTKXRFbR9MQ/vDH/JPj4QN3XPHJuubxLhUf8WObEBtML7J11uvVM1oDTwM5YG5yjyBnc+85OaQaB9tMPDheGhfMG40F4vxdSnQL29ihyrls0hrFTY9UZ4Y2FmJwYL0rOnGU7iPyNuExQwfg2bkdw67aH9nEGjSd2eXYl2bI4DHujy5GJiV3dR9TlUF0iaSeHVSIX5t9I/BXK+AiSqHTrvwdGGi9XvL6xEWYMOZOpJnCH8Q4OSibsFfQXnCMgIFeO7J/ZMGXqltXOtztgQMr8VvRRD3S+Lcp8yKb5aUjWwoCxb4YzEUbQE04SRVeAGjsfNJcXgT review.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= -- cgit v1.2.3 From aec55bc67373704e3da23d4d28bb6f6faeadd516 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 9 Aug 2018 15:54:40 +0000 Subject: tcwg-base: Use a better heuristic for detecting Cambridge network ... which works inside docker containers with their own sub-networks. Change-Id: I538d08d4f5ddd5a0714c076269319c7844416d8b --- tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 24038b50..d088179f 100755 --- a/tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh @@ -1,6 +1,6 @@ #!/bin/sh -if ip addr show 2>&1 | grep -q "inet 192\.168\.1[678]\."; then +if grep -q "nameserver 192.168.16.3" /etc/resolv.conf; then # If we are in one of TCWG Cambridge subnetworks, then use straight nc. exec nc "$@" else -- cgit v1.2.3