4 files changed, 43 insertions, 11 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index f33e6e918..762a4ff91 100644
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -27,6 +27,6 @@
     project-name: ci-management
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-4c-4g
+    build-node: centos7-builder-8c-8g
     project: ci-management
     branch: master
diff --git a/jjb/scripts/backup_upload_archives.sh b/jjb/scripts/backup_upload_archives.sh
index 1a9c577e1..0599c9676 100755
--- a/jjb/scripts/backup_upload_archives.sh
+++ b/jjb/scripts/backup_upload_archives.sh
@@ -23,9 +23,6 @@ if [ -f "$PYTHON_SCRIPT" ]; then
 	exit 0
 fi
 
-# TEMPORARY: talk to consul-aware resolver rather than external ones
-echo "nameserver 172.17.0.1" >/etc/resolv.conf
-
 # the Python code below needs boto3 installed
 python3 -m pip install boto3
 mkdir -p $(dirname "$PYTHON_SCRIPT")
diff --git a/jjb/scripts/post_build_deploy_archives.sh b/jjb/scripts/post_build_deploy_archives.sh
index 0a47903e8..b7e7cec45 100755
--- a/jjb/scripts/post_build_deploy_archives.sh
+++ b/jjb/scripts/post_build_deploy_archives.sh
@@ -19,6 +19,20 @@ set +e  # Do not affect the build result if some part of archiving fails.
 WS_ARCHIVES_DIR="$WORKSPACE/archives"
 BUILD_ENV_LOG="$WS_ARCHIVES_DIR/_build-enviroment-variables.log"
 
+# Output executor runtime attributes [again] in case the job fails prior to
+# running setup_executor_env.sh
+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)
+echo "$long_line"
+echo "Executor Runtime Attributes:"
+echo "OS: $OS_ID-$OS_VERSION_ID"
+echo "Arch: $OS_ARCH"
+echo "Nomad Hostname: $(grep search /etc/resolv.conf | cut -d' ' -f2 | head -1)"
+echo "Container ID: $(hostname)"
+echo "$long_line"
+
 # Generate gdb-command script to output vpp stack traceback from core files.
 gdb_cmdfile="/tmp/gdb-commands"
 cat >$gdb_cmdfile <<'__END__'
diff --git a/jjb/scripts/setup_executor_env.sh b/jjb/scripts/setup_executor_env.sh
index 1cc922a01..f9aecfa40 100755
--- a/jjb/scripts/setup_executor_env.sh
+++ b/jjb/scripts/setup_executor_env.sh
@@ -26,10 +26,11 @@ long_line="*********************************************************************
 downloads_cache="/root/Downloads"
 
 echo "$long_line"
-echo "Executor OS: $OS_ID-$OS_VERSION_ID"
-echo "Executor Arch: $OS_ARCH"
-# TODO: fix this to print nomad server hostname
-echo "Executor hostname: $(hostname)"
+echo "Executor Runtime Attributes:"
+echo "OS: $OS_ID-$OS_VERSION_ID"
+echo "Arch: $OS_ARCH"
+echo "Nomad Hostname: $(grep search /etc/resolv.conf | cut -d' ' -f2 | head -1)"
+echo "Container ID: $(hostname)"
 
 echo "$long_line"
 if [ -f "$dockerfile" ] ; then
@@ -55,10 +56,30 @@ pip3 list 2>/dev/null | column -t || true
 echo "$long_line"
 echo "Executor Downloads cache '$downloads_cache':"
 ls -lh "$downloads_cache" || true
-echo "$long_line"
 
-# TEMPORARY: talk to consul-aware resolver rather than external ones
-echo "nameserver 172.17.0.1" >/etc/resolv.conf
+echo "$long_line"
 echo "DNS nameserver config in '/etc/resolv.conf':"
 cat /etc/resolv.conf || true
+
+if [ -n "${CCACHE_DIR:-}" ] ; then
+    echo "$long_line"
+    if [ -d "$CCACHE_DIR" ] ; then
+        num_ccache_files="$(find $CCACHE_DIR -type f | wc -l)"
+        ccache_conf="$CCACHE_DIR/ccache.conf"
+        echo "CCACHE_DIR='$CCACHE_DIR' ($num_ccache_files ccache files):"
+        du -sh /tmp/ccache
+        df -h /tmp/ccache
+        ls -l $CCACHE_DIR
+        unset -v CCACHE_DISABLE
+        if [ -f "$ccache_conf" ] ; then
+            echo "Contents of $ccache_conf:"
+            cat $ccache_conf
+        fi
+    else
+        echo "CCACHE_DIR='$CCACHE_DIR' is missing, disabling CCACHE..."
+        unset -v CCACHE_DIR
+        export CCACHE_DISABLE="1"
+        echo "CCACHE_DISABLE='${CCACHE_DISABLE:-}'"
+    fi
+fi
 echo "$long_line"