summaryrefslogtreecommitdiffstats
path: root/jenkins-config
diff options
context:
space:
mode:
Diffstat (limited to 'jenkins-config')
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-prod-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-sandbox-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-test-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-prod-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-sandbox-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-test-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg2
30 files changed, 30 insertions, 30 deletions
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-prod-x86_64.yaml
index 95b451f1..446ca3f8 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-prod-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-centos7-prod-x86_64"
memory: 14000
prefix: "builder-centos7-prod-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos7:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-sandbox-x86_64.yaml
index 6a52ded1..0b0b4fcf 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-sandbox-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-centos7-sandbox-x86_64"
memory: 14000
prefix: "builder-centos7-sandbox-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos7:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-test-x86_64.yaml
index 1b58ba50..633e78f5 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-test-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-test-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-centos7-test-x86_64"
memory: 14000
prefix: "builder-centos7-test-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos7:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-aarch64.yaml
index b01ee17b..e24578d6 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-centos8:prod-aarch64"
labels: "builder-centos8-prod-aarch64"
prefix: "builder-centos8-prod-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos8:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-x86_64.yaml
index efba4808..7b59d1b9 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-centos8-prod-x86_64"
memory: 14000
prefix: "builder-centos8-prod-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos8:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-aarch64.yaml
index 6dd19a3a..b43bf9cb 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-centos8:sandbox-aarch64"
labels: "builder-centos8-sandbox-aarch64"
prefix: "builder-centos8-sandbox-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos8:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-x86_64.yaml
index a5ec1c12..f91a943e 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-centos8-sandbox-x86_64"
memory: 14000
prefix: "builder-centos8-sandbox-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos8:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-aarch64.yaml
index e64c44a6..daf222d1 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-centos8:test-aarch64"
labels: "builder-centos8-test-aarch64"
prefix: "builder-centos8-test-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos8:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-x86_64.yaml
index e6fe1df6..ac7200c2 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-centos8-test-x86_64"
memory: 14000
prefix: "builder-centos8-test-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos8:/scratch/ccache"
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 27433e69..d15a462a 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
@@ -12,4 +12,4 @@ templates:
labels: "builder-debian10-prod-x86_64"
memory: 14000
prefix: "builder-debian10-prod-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ 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 93200364..8e2293a5 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
@@ -12,4 +12,4 @@ templates:
labels: "builder-debian10-sandbox-x86_64"
memory: 14000
prefix: "builder-debian10-sandbox-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.debian10:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-x86_64.yaml
index e40a09b0..d49a0ba2 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-debian10-test-x86_64"
memory: 14000
prefix: "builder-debian10-test-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.debian10:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-prod-x86_64.yaml
index d4115a53..edb1482b 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-prod-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-debian9-prod-x86_64"
memory: 14000
prefix: "builder-debian9-prod-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.debian9:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-sandbox-x86_64.yaml
index 5a3a6c76..d94dcebe 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-sandbox-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-debian9-sandbox-x86_64"
memory: 14000
prefix: "builder-debian9-sandbox-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.debian9:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-test-x86_64.yaml
index 057527f1..66c0604d 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-test-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-test-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-debian9-test-x86_64"
memory: 14000
prefix: "builder-debian9-test-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.debian9:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml
index d72e1dd0..60bee47b 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-ubuntu1804:prod-aarch64"
labels: "builder-ubuntu1804-prod-aarch64"
prefix: "builder-ubuntu1804-prod-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-x86_64.yaml
index b6267bef..8bde8f37 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-ubuntu1804-prod-x86_64"
memory: 14000
prefix: "builder-ubuntu1804-prod-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml
index f897aa46..af7f2c27 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-ubuntu1804:sandbox-aarch64"
labels: "builder-ubuntu1804-sandbox-aarch64"
prefix: "builder-ubuntu1804-sandbox-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-x86_64.yaml
index 9fd8d0c1..58c86ce5 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-ubuntu1804-sandbox-x86_64"
memory: 14000
prefix: "builder-ubuntu1804-sandbox-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml
index bcb41bbc..a1b9011f 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-ubuntu1804:test-aarch64"
labels: "builder-ubuntu1804-test-aarch64"
prefix: "builder-ubuntu1804-test-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-x86_64.yaml
index 83691cff..c3ff4524 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-ubuntu1804-test-x86_64"
memory: 14000
prefix: "builder-ubuntu1804-test-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu1804:/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 eee2c641..7d4c78d9 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,4 @@ templates:
- image: "fdiotools/builder-ubuntu2004:prod-aarch64"
labels: "builder-ubuntu2004-prod-aarch64"
prefix: "builder-ubuntu2004-prod-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ 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 4cf8a955..11305584 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
@@ -12,4 +12,4 @@ templates:
labels: "builder-ubuntu2004-prod-x86_64"
memory: 20000
prefix: "builder-ubuntu2004-prod-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ 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 dd4de729..bfc87f2b 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,4 @@ templates:
- image: "fdiotools/builder-ubuntu2004:sandbox-aarch64"
labels: "builder-ubuntu2004-sandbox-aarch64"
prefix: "builder-ubuntu2004-sandbox-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ 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 3fc8d54d..b218c615 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
@@ -12,4 +12,4 @@ templates:
labels: "builder-ubuntu2004-sandbox-x86_64"
memory: 14000
prefix: "builder-ubuntu2004-sandbox-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml
index 850d53ac..a277684d 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-ubuntu2004:test-aarch64"
labels: "builder-ubuntu2004-test-aarch64"
prefix: "builder-ubuntu2004-test-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-x86_64.yaml
index 5a1c326f..58f661c8 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-ubuntu2004-test-x86_64"
memory: 14000
prefix: "builder-ubuntu2004-test-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache"
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg
index b08b4fb3..cf844cd2 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg
@@ -1,4 +1,4 @@
IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366
LABELS=centos7-builder-2c-2g
-HARDWARE_ID=v2-highcpu-2
+HARDWARE_ID=v3-standard-2
VOLUME_SIZE=40
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg
index ec1d18ac..0b62d1ab 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg
@@ -1,4 +1,4 @@
IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366
LABELS=centos7-builder-4c-4g
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=v3-standard-4
VOLUME_SIZE=40
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg
index 1a871279..80e19418 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg
@@ -8,7 +8,7 @@ OS_CLOUD=vexci
# Default Template Configuration
IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366
VOLUME_SIZE=20
-HARDWARE_ID=v2-highcpu-2
+HARDWARE_ID=v3-standard-2
NETWORK_ID=bcb9a62c-5a82-4293-a8c6-d73e8c2dbd03
USER_DATA_ID=jenkins-init-system
INSTANCE_CAP=20