From 672f06dd9d8a2b0b4c536e70d71c40bb85d720f4 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Wed, 19 Oct 2022 11:58:44 -0400 Subject: [PATCH] Set FDIONOMAD container hostname with job and node info. Signed-off-by: Dave Wallace Change-Id: Ida46ca8a0bbbb66919445cce399679b13e27e85f --- jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml | 1 + jjb/scripts/setup_executor_env.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml index b0f1ae370..83eed5f12 100644 --- 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 4d3cb6ecf..11de12cff 100755 --- 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" -- 2.16.6