summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2021-04-23 09:04:12 +0000
committerGerrit Code Review <gerrit@fd.io>2021-04-23 09:04:12 +0000
commit8b096b06ec27886b0d4fb7e48073474d79afb9e2 (patch)
tree10e6ee91529a0c8348edd5db612b6c1b71f9f152
parent07afa5e16b729b4a8e03b2e35cfee168c2c5dd76 (diff)
parent8702a6af537154bf10a38a874c0e93eed0fb5f32 (diff)
Merge "Refactor ccache config to use per-os ccache dirs."
-rw-r--r--docker/scripts/lib_apt.sh3
-rw-r--r--docker/scripts/lib_dnf.sh3
-rw-r--r--docker/scripts/lib_yum.sh3
-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
-rwxr-xr-xjjb/scripts/setup_executor_env.sh28
31 files changed, 44 insertions, 47 deletions
diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh
index a2e5c98a..725aedcc 100644
--- a/docker/scripts/lib_apt.sh
+++ b/docker/scripts/lib_apt.sh
@@ -221,7 +221,7 @@ generate_apt_dockerfile_clean() {
# Clean up copy-in build tree
RUN dbld_dump_build_logs.sh \\
- && rm -rf "/tmp/*" "$DOCKER_BUILD_FILES_DIR"
+ && rm -rf "/tmp/*" "$DOCKER_BUILD_FILES_DIR" "/root/.ccache"
EOF
}
@@ -260,6 +260,7 @@ WORKDIR /
$vpp_install_skip_sysctl_envvar
ENV VPP_ZOMBIE_NOCHECK="1"
ENV CCACHE_DIR="/scratch/ccache"
+ENV CCACHE_MAXSIZE="10G"
EOF
generate_apt_dockerfile_clean
}
diff --git a/docker/scripts/lib_dnf.sh b/docker/scripts/lib_dnf.sh
index 34bc40c7..45204210 100644
--- a/docker/scripts/lib_dnf.sh
+++ b/docker/scripts/lib_dnf.sh
@@ -38,7 +38,7 @@ generate_dnf_dockerfile_clean() {
# Clean up
RUN dbld_dump_build_logs.sh \\
- && rm -rf "/tmp/*"
+ && rm -rf "/tmp/*" "/root/.ccache"
EOF
}
@@ -167,6 +167,7 @@ RUN gem install package_cloud \\
WORKDIR /
ENV VPP_ZOMBIE_NOCHECK="1"
ENV CCACHE_DIR="/scratch/ccache"
+ENV CCACHE_MAXSIZE="10G"
EOF
generate_dnf_dockerfile_clean
}
diff --git a/docker/scripts/lib_yum.sh b/docker/scripts/lib_yum.sh
index 4e165e6e..27c297a1 100644
--- a/docker/scripts/lib_yum.sh
+++ b/docker/scripts/lib_yum.sh
@@ -144,7 +144,7 @@ generate_yum_dockerfile_clean() {
# Clean up
RUN dbld_dump_build_logs.sh \\
- && rm -rf "/tmp/*"
+ && rm -rf "/tmp/*" "/root/.ccache"
EOF
}
@@ -170,6 +170,7 @@ RUN gem install package_cloud \\
WORKDIR /
ENV VPP_ZOMBIE_NOCHECK="1"
ENV CCACHE_DIR="/scratch/ccache"
+ENV CCACHE_MAXSIZE="10G"
EOF
generate_yum_dockerfile_clean
}
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/jjb/scripts/setup_executor_env.sh b/jjb/scripts/setup_executor_env.sh
index f9aecfa4..a6b8216d 100755
--- a/jjb/scripts/setup_executor_env.sh
+++ b/jjb/scripts/setup_executor_env.sh
@@ -61,25 +61,19 @@ echo "$long_line"
echo "DNS nameserver config in '/etc/resolv.conf':"
cat /etc/resolv.conf || true
-if [ -n "${CCACHE_DIR:-}" ] ; then
- echo "$long_line"
- if [ -d "$CCACHE_DIR" ] ; then
- num_ccache_files="$(find $CCACHE_DIR -type f | wc -l)"
- ccache_conf="$CCACHE_DIR/ccache.conf"
- echo "CCACHE_DIR='$CCACHE_DIR' ($num_ccache_files ccache files):"
- du -sh /tmp/ccache
- df -h /tmp/ccache
- ls -l $CCACHE_DIR
- unset -v CCACHE_DISABLE
- if [ -f "$ccache_conf" ] ; then
- echo "Contents of $ccache_conf:"
- cat $ccache_conf
- fi
- else
+echo "$long_line"
+if [ -n "$(which ccache || true)" ] ; then
+ if [ -z "${CCACHE_DIR:-}" ] || [ ! -d "$CCACHE_DIR" ] ; then
echo "CCACHE_DIR='$CCACHE_DIR' is missing, disabling CCACHE..."
- unset -v CCACHE_DIR
export CCACHE_DISABLE="1"
- echo "CCACHE_DISABLE='${CCACHE_DISABLE:-}'"
fi
+ if [ -n "${CCACHE_DISABLE:-}" ] ; then
+ echo "CCACHE_DISABLE = '$CCACHE_DISABLE'"
+ fi
+ echo "ccache statistics:"
+ ccache -s
+else
+ echo "WARNING: ccache is not installed!"
+ export CCACHE_DISABLE="1"
fi
echo "$long_line"