From 619829d43b0ed92ca25b4cffd3fc88e18ee4652c Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Thu, 20 Oct 2022 13:13:01 -0400 Subject: Fix volume mounts for nomad docker executors. Signed-off-by: Dave Wallace Change-Id: Ifdca52143e3e8097196df31af215c35b7d1519fb --- .../clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-aarch64.yaml | 1 - .../clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-x86_64.yaml | 1 - .../nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-aarch64.yaml | 1 - .../nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-x86_64.yaml | 1 - .../clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml | 4 +--- .../nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml | 4 +--- .../nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml | 4 +--- jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml | 2 +- 21 files changed, 17 insertions(+), 53 deletions(-) (limited to 'jenkins-config') 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 5599ed713..c6134f265 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,6 +10,4 @@ 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" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.debian10:/scratch/ccache" 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 f3e868c8e..81d49e40e 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,6 +10,4 @@ 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" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.debian10:/scratch/ccache" 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 807345dbe..701e78f9a 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,6 +10,4 @@ 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" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.debian11:/scratch/ccache" 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 4888cd0df..fceac0248 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,6 +10,4 @@ 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" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.debian11:/scratch/ccache" 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 d5715a5f5..7d4c78d90 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml @@ -3,6 +3,4 @@ templates: - image: "fdiotools/builder-ubuntu2004:prod-aarch64" labels: "builder-ubuntu2004-prod-aarch64" prefix: "builder-ubuntu2004-prod-aarch64" - hostVolumes: - - "/tmp/ccache.ubuntu2004:/scratch/ccache" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" 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 21d9b7380..902083652 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,6 +10,4 @@ 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" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" 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 920bffec2..bfc87f2b0 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml @@ -3,6 +3,4 @@ templates: - image: "fdiotools/builder-ubuntu2004:sandbox-aarch64" labels: "builder-ubuntu2004-sandbox-aarch64" prefix: "builder-ubuntu2004-sandbox-aarch64" - hostVolumes: - - "/tmp/ccache.ubuntu2004:/scratch/ccache" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" 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 54b317cec..9910fdd0a 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,6 +10,4 @@ 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" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" 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 3973add9d..b4377e91c 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml @@ -3,6 +3,4 @@ templates: - image: "fdiotools/builder-ubuntu2204:prod-aarch64" labels: "builder-ubuntu2204-prod-aarch64" prefix: "builder-ubuntu2204-prod-aarch64" - hostVolumes: - - "/tmp/ccache.ubuntu2204:/scratch/ccache" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" 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 24a466f2e..1170d2cce 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,6 +10,4 @@ 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" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" 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 5916fafae..66a863165 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml @@ -3,6 +3,4 @@ templates: - image: "fdiotools/builder-ubuntu2204:sandbox-aarch64" labels: "builder-ubuntu2204-sandbox-aarch64" prefix: "builder-ubuntu2204-sandbox-aarch64" - hostVolumes: - - "/tmp/ccache.ubuntu2204:/scratch/ccache" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" 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 0af88c947..3a70830b6 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,6 +10,4 @@ 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" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" 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 9f0df6444..80a909377 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,4 +10,3 @@ 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 02b1dc44e..e172415dc 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,4 +10,3 @@ 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 f982bd555..d2f507762 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,4 +10,3 @@ 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 3182a0950..a68b2f1e2 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,4 +10,3 @@ 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 096738112..4b43d6b75 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,6 +10,4 @@ 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" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" 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 84764a1b6..07e4bbcf9 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,6 +10,4 @@ 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" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" 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 628bea33e..0f3d12bd6 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,6 +10,4 @@ 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" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" 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 0de454f41..1109b8ccb 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,6 +10,4 @@ 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" - - "/scratch/nomad:/scratch/nomad" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml index b0f1ae370..87e2ee0de 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml @@ -16,7 +16,7 @@ templates: numExecutors: 1 prefixCmd: "" forcePull: true - hostVolumes: "" + hostVolumes: "/scratch/nomad:/scratch/nomad:ro" privileged: true reusable: false useRawExec: false -- cgit 1.2.3-korg