diff options
Diffstat (limited to 'tcwg-base/tcwg-llvmbot')
| -rwxr-xr-x | tcwg-base/tcwg-llvmbot/run.sh | 10 | ||||
| -rwxr-xr-x | tcwg-base/tcwg-llvmbot/start.sh | 30 |
2 files changed, 6 insertions, 34 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 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" ;; |