Set FDIONOMAD container hostname with job and node info.

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: Ida46ca8a0bbbb66919445cce399679b13e27e85f

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml
index b0f1ae3..83eed5f 100644 (file)
--- a/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml
@@ -17,6 +17,7 @@ templates:
     prefixCmd: ""
     forcePull: true
     hostVolumes: ""
+    hostname: "${NOMAD_JOB_NAME}__${NOMAD_GROUP_NAME}__${NOMAD_TASK_NAME}__${node.unique.name}__${NOMAD_ALLOC_ID}"
     privileged: true
     reusable: false
     useRawExec: false

diff --git a/jjb/scripts/setup_executor_env.sh b/jjb/scripts/setup_executor_env.sh
index 4d3cb6e..11de12c 100755 (executable)
--- a/jjb/scripts/setup_executor_env.sh
+++ b/jjb/scripts/setup_executor_env.sh
@@ -30,7 +30,6 @@ 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"