diff options
author | Dave Wallace <dwallacelf@gmail.com> | 2022-10-19 21:48:45 -0400 |
---|---|---|
committer | Dave Wallace <dwallacelf@gmail.com> | 2022-10-19 21:48:45 -0400 |
commit | ff9238d6ca62a5601e6dd3cc4307f7f80bed8c76 (patch) | |
tree | d595cbd76acbafc56d35832c3039b002c4779a72 | |
parent | 8692d97f1688b603c39ae6a1faf2655d4f27762f (diff) |
Fix Nomad hostname output in docker job console logs.
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: If88be92314290bd2b2d0b1bbb21167b6286b8155
21 files changed, 63 insertions, 17 deletions
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml index c6134f26..5599ed71 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml @@ -10,4 +10,6 @@ templates: image: "fdiotools/builder-debian10:prod-x86_64" labels: "builder-debian10-prod-x86_64" prefix: "builder-debian10-prod-x86_64" - hostVolumes: "/tmp/ccache.debian10:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.debian10:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml index 81d49e40..f3e868c8 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml @@ -10,4 +10,6 @@ templates: image: "fdiotools/builder-debian10:sandbox-x86_64" labels: "builder-debian10-sandbox-x86_64" prefix: "builder-debian10-sandbox-x86_64" - hostVolumes: "/tmp/ccache.debian10:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.debian10:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml index 701e78f9..807345db 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml @@ -10,4 +10,6 @@ templates: image: "fdiotools/builder-debian11:prod-x86_64" labels: "builder-debian11-prod-x86_64" prefix: "builder-debian11-prod-x86_64" - hostVolumes: "/tmp/ccache.debian11:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.debian11:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml index fceac024..4888cd0d 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml @@ -10,4 +10,6 @@ templates: image: "fdiotools/builder-debian11:sandbox-x86_64" labels: "builder-debian11-sandbox-x86_64" prefix: "builder-debian11-sandbox-x86_64" - hostVolumes: "/tmp/ccache.debian11:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.debian11:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml index 7d4c78d9..d5715a5f 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml @@ -3,4 +3,6 @@ templates: - image: "fdiotools/builder-ubuntu2004:prod-aarch64" labels: "builder-ubuntu2004-prod-aarch64" prefix: "builder-ubuntu2004-prod-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.ubuntu2004:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml index 90208365..21d9b738 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml @@ -10,4 +10,6 @@ templates: image: "fdiotools/builder-ubuntu2004:prod-x86_64" labels: "builder-ubuntu2004-prod-x86_64" prefix: "builder-ubuntu2004-prod-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.ubuntu2004:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml index bfc87f2b..920bffec 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml @@ -3,4 +3,6 @@ templates: - image: "fdiotools/builder-ubuntu2004:sandbox-aarch64" labels: "builder-ubuntu2004-sandbox-aarch64" prefix: "builder-ubuntu2004-sandbox-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.ubuntu2004:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml index 9910fdd0..54b317ce 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml @@ -10,4 +10,6 @@ templates: image: "fdiotools/builder-ubuntu2004:sandbox-x86_64" labels: "builder-ubuntu2004-sandbox-x86_64" prefix: "builder-ubuntu2004-sandbox-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.ubuntu2004:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml index b4377e91..3973add9 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml @@ -3,4 +3,6 @@ templates: - image: "fdiotools/builder-ubuntu2204:prod-aarch64" labels: "builder-ubuntu2204-prod-aarch64" prefix: "builder-ubuntu2204-prod-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.ubuntu2204:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml index 1170d2cc..24a466f2 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml @@ -10,4 +10,6 @@ templates: image: "fdiotools/builder-ubuntu2204:prod-x86_64" labels: "builder-ubuntu2204-prod-x86_64" prefix: "builder-ubuntu2204-prod-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.ubuntu2204:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml index 66a86316..5916fafa 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml @@ -3,4 +3,6 @@ templates: - image: "fdiotools/builder-ubuntu2204:sandbox-aarch64" labels: "builder-ubuntu2204-sandbox-aarch64" prefix: "builder-ubuntu2204-sandbox-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.ubuntu2204:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml index 3a70830b..0af88c94 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml @@ -10,4 +10,6 @@ templates: image: "fdiotools/builder-ubuntu2204:sandbox-x86_64" labels: "builder-ubuntu2204-sandbox-x86_64" prefix: "builder-ubuntu2204-sandbox-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.ubuntu2204:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-aarch64.yaml index 80a90937..9f0df644 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-aarch64.yaml @@ -10,3 +10,4 @@ templates: image: "fdiotools/builder-ubuntu2004:prod-aarch64" labels: "csit-builder-ubuntu2004-prod-aarch64" prefix: "csit-builder-ubuntu2004-prod-aarch64" + hostVolumes: "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-x86_64.yaml index e172415d..02b1dc44 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-x86_64.yaml @@ -10,3 +10,4 @@ templates: image: "fdiotools/builder-ubuntu2004:prod-x86_64" labels: "csit-builder-ubuntu2004-prod-x86_64" prefix: "csit-builder-ubuntu2004-prod-x86_64" + hostVolumes: "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-aarch64.yaml index d2f50776..f982bd55 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-aarch64.yaml @@ -10,3 +10,4 @@ templates: image: "fdiotools/builder-ubuntu2004:sandbox-aarch64" labels: "csit-builder-ubuntu2004-sandbox-aarch64" prefix: "csit-builder-ubuntu2004-sandbox-aarch64" + hostVolumes: "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-x86_64.yaml index a68b2f1e..3182a095 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-x86_64.yaml @@ -10,3 +10,4 @@ templates: image: "fdiotools/builder-ubuntu2004:sandbox-x86_64" labels: "csit-builder-ubuntu2004-sandbox-x86_64" prefix: "csit-builder-ubuntu2004-sandbox-x86_64" + hostVolumes: "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml index 4b43d6b7..09673811 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml @@ -10,4 +10,6 @@ templates: image: "fdiotools/builder-ubuntu2204:prod-aarch64" labels: "csit-builder-ubuntu2204-prod-aarch64" prefix: "csit-builder-ubuntu2204-prod-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.ubuntu2204:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml index 07e4bbcf..84764a1b 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml @@ -10,4 +10,6 @@ templates: image: "fdiotools/builder-ubuntu2204:prod-x86_64" labels: "csit-builder-ubuntu2204-prod-x86_64" prefix: "csit-builder-ubuntu2204-prod-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.ubuntu2204:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml index 0f3d12bd..628bea33 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml @@ -10,4 +10,6 @@ templates: image: "fdiotools/builder-ubuntu2204:sandbox-aarch64" labels: "csit-builder-ubuntu2204-sandbox-aarch64" prefix: "csit-builder-ubuntu2204-sandbox-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.ubuntu2204:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml index 1109b8cc..0de454f4 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml @@ -10,4 +10,6 @@ templates: image: "fdiotools/builder-ubuntu2204:sandbox-x86_64" labels: "csit-builder-ubuntu2204-sandbox-x86_64" prefix: "csit-builder-ubuntu2204-sandbox-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" + hostVolumes: + - "/tmp/ccache.ubuntu2204:/scratch/ccache" + - "/scratch/nomad:/scratch/nomad" diff --git a/jjb/scripts/setup_executor_env.sh b/jjb/scripts/setup_executor_env.sh index 4d3cb6ec..72782490 100755 --- a/jjb/scripts/setup_executor_env.sh +++ b/jjb/scripts/setup_executor_env.sh @@ -25,12 +25,22 @@ file_delimiter="----- %< -----" long_line="************************************************************************" downloads_cache="/root/Downloads" +# Requires all nomad client machines to run the following command +# and mount /scratch/nomad into the docker container: +# sudo mkdir -p /scratch/nomad && echo "$(hostname)-$(uname -m)" | sudo tee /scratch/nomad/nomad-client +nomad_client_file="/scratch/nomad/nomad-client" +if [ -f "$nomad_client_file" ] ; then + NOMAD_CLIENT="$(cat $nomad_client_file)" +else + NOMAD_CLIENT="Unknown" +fi + # Node info 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 "Nomad Client Hostname: $NOMAD_CLIENT" echo "Container ID: $(hostname)" echo "$long_line" |