Revert "Set FDIONOMAD container hostname with job and node info."

This reverts commit 672f06dd9d8a2b0b4c536e70d71c40bb85d720f4.

Reason for revert: JCasC is not happy with this.

Change-Id: I906053a454cbaaaf2a4cbf6f87bb258e25e8b034
Signed-off-by: Dave Wallace <[email protected]>

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml
index 83eed5f..b0f1ae3 100644 (file)
--- a/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml
@@ -17,7 +17,6 @@ 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 11de12c..4d3cb6e 100755 (executable)
--- a/jjb/scripts/setup_executor_env.sh
+++ b/jjb/scripts/setup_executor_env.sh
@@ -30,6 +30,7 @@ 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"