diff options
Diffstat (limited to 'jjb/scripts/post_build_executor_info.sh')
| -rwxr-xr-x | jjb/scripts/post_build_executor_info.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/jjb/scripts/post_build_executor_info.sh b/jjb/scripts/post_build_executor_info.sh index fef79814..d81b613e 100755 --- a/jjb/scripts/post_build_executor_info.sh +++ b/jjb/scripts/post_build_executor_info.sh @@ -21,13 +21,24 @@ long_line="********************************************************************* OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') OS_ARCH=$(uname -m) + +# Requires all nomad client machines to run the following command +# and mount /scratch/nomad into the docker container: +# sudo mkdir -p /scratch/nomad && echo "$(hostname)-$(uname -m)" | sudo tee /scratch/nomad/nomad-client +nomad_client_file="/scratch/nomad/nomad-client" +if [ -f "$nomad_client_file" ] ; then + NOMAD_CLIENT="$(cat $nomad_client_file)" +else + NOMAD_CLIENT="Unknown" +fi + echo "$long_line" echo "Executor Runtime Attributes:" echo "OS: $OS_ID-$OS_VERSION_ID" echo " $(uname -a)" echo "Number CPUs: $(nproc)" echo "Arch: $OS_ARCH" -echo "Nomad Hostname: $(grep search /etc/resolv.conf | cut -d' ' -f2 | head -1)" +echo "Nomad Client Hostname: $NOMAD_CLIENT" echo "Container ID: $(hostname)" echo "$long_line" echo -e "lscpu:\n$(lscpu)" @@ -45,14 +56,3 @@ if [ -n "$(which ccache)" ] ; then fi echo "$long_line" - -# Avoid sar anomaly on centos-7 in global-jjb/shell/logs-deploy.sh -# -# Note: VPP 20.09 will be removed in the next release cycle (21.10), -# therefore this hack is better than polluting the docker image -# build scripts with code to avoid installing sysstat on centos-7. -# -# TODO: Remove when vpp-*-2009-centos7-x86_64 jobs are removed -if [ "$OS_ID" = "centos" ] && [ "$OS_VERSION_ID" = "7" ] ; then - sudo yum remove -y sysstat >& /dev/null || true -fi |