Fix volume mounts for nomad docker executors.

Signed-off-by: Dave Wallace <[email protected]>
Change-Id: Ifdca52143e3e8097196df31af215c35b7d1519fb

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 5599ed7..c6134f2 100644 (file)
--- 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 f3e868c..81d49e4 100644 (file)
--- 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 807345d..701e78f 100644 (file)
--- 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 4888cd0..fceac02 100644 (file)
--- 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 d5715a5..7d4c78d 100644 (file)
--- 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 21d9b73..9020836 100644 (file)
--- 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 920bffe..bfc87f2 100644 (file)
--- 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 54b317c..9910fdd 100644 (file)
--- 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 3973add..b4377e9 100644 (file)
--- 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 24a466f..1170d2c 100644 (file)
--- 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 5916faf..66a8631 100644 (file)
--- 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 0af88c9..3a70830 100644 (file)
--- 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 9f0df64..80a9093 100644 (file)
--- 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 02b1dc4..e172415 100644 (file)
--- 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 f982bd5..d2f5077 100644 (file)
--- 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 3182a09..a68b2f1 100644 (file)
--- 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 0967381..4b43d6b 100644 (file)
--- 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 84764a1..07e4bbc 100644 (file)
--- 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 628bea3..0f3d12b 100644 (file)
--- 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 0de454f..1109b8c 100644 (file)
--- 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 b0f1ae3..87e2ee0 100644 (file)
--- 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