diff options
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 c6134f265..5599ed713 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 81d49e40e..f3e868c8e 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 701e78f9a..807345dbe 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 fceac0248..4888cd0df 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 7d4c78d90..d5715a5f5 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 902083652..21d9b7380 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 bfc87f2b0..920bffec2 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 9910fdd0a..54b317cec 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 b4377e91c..3973add9d 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 1170d2cce..24a466f2e 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 66a863165..5916fafae 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 3a70830b6..0af88c947 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 80a909377..9f0df6444 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 e172415dc..02b1dc44e 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 d2f507762..f982bd555 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 a68b2f1e2..3182a0950 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 4b43d6b75..096738112 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 07e4bbcf9..84764a1b6 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 0f3d12bd6..628bea33e 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 1109b8ccb..0de454f41 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 4d3cb6ecf..727824909 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" |