diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2022-10-19 17:07:39 +0000 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2022-10-19 17:07:39 +0000 |
| commit | 8692d97f1688b603c39ae6a1faf2655d4f27762f (patch) | |
| tree | c67470ec5098c8467226079bd1506cc1ec03080a | |
| parent | 672f06dd9d8a2b0b4c536e70d71c40bb85d720f4 (diff) | |
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 <dwallacelf@gmail.com>
| -rw-r--r-- | jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml | 1 | ||||
| -rwxr-xr-x | jjb/scripts/setup_executor_env.sh | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml index 83eed5f1..b0f1ae37 100644 --- 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 11de12cf..4d3cb6ec 100755 --- 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" |