diff options
40 files changed, 52 insertions, 51 deletions
diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh index 8994a7829..af9da0b63 100644 --- a/docker/scripts/lib_apt.sh +++ b/docker/scripts/lib_apt.sh @@ -249,8 +249,7 @@ COPY files/sshconfig /root/.ssh/config WORKDIR / $vpp_install_skip_sysctl_envvar ENV VPP_ZOMBIE_NOCHECK="1" -# TODO: Mount ccache volume into docker container, then remove this. -ENV CCACHE_DISABLE="1" +ENV CCACHE_DIR="/scratch/ccache" EOF generate_apt_dockerfile_clean } diff --git a/docker/scripts/lib_dnf.sh b/docker/scripts/lib_dnf.sh index c5bb5c4a2..34bc40c7f 100644 --- a/docker/scripts/lib_dnf.sh +++ b/docker/scripts/lib_dnf.sh @@ -166,8 +166,7 @@ RUN gem install package_cloud \\ # CI Runtime Environment WORKDIR / ENV VPP_ZOMBIE_NOCHECK="1" -# TODO: Mount ccache volume into docker container, then remove this. -ENV CCACHE_DISABLE="1" +ENV CCACHE_DIR="/scratch/ccache" EOF generate_dnf_dockerfile_clean } diff --git a/docker/scripts/lib_yum.sh b/docker/scripts/lib_yum.sh index b24b2299a..4e165e6e0 100644 --- a/docker/scripts/lib_yum.sh +++ b/docker/scripts/lib_yum.sh @@ -169,8 +169,7 @@ RUN gem install package_cloud \\ # CI Runtime Environment WORKDIR / ENV VPP_ZOMBIE_NOCHECK="1" -# TODO: Mount ccache volume into docker container, then remove this. -ENV CCACHE_DISABLE="1" +ENV CCACHE_DIR="/scratch/ccache" EOF generate_yum_dockerfile_clean } diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-prod-aarch64.yaml deleted file mode 100644 index 95b632ffb..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-prod-aarch64.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -templates: - - image: "fdiotools/builder-centos7:prod-aarch64" - labels: "builder-centos7-prod-aarch64" - prefix: "builder-centos7-prod-aarch64" 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 a5d77a7be..95b451f16 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,3 +12,4 @@ templates: labels: "builder-centos7-prod-x86_64" memory: 14000 prefix: "builder-centos7-prod-x86_64" + hostVolumes: "/tmp/ccache:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-sandbox-aarch64.yaml deleted file mode 100644 index 2458aa9b6..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-sandbox-aarch64.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -templates: - - image: "fdiotools/builder-centos7:sandbox-aarch64" - labels: "builder-centos7-sandbox-aarch64" - prefix: "builder-centos7-sandbox-aarch64" 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 efa35ed82..6a52ded16 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,3 +12,4 @@ templates: labels: "builder-centos7-sandbox-x86_64" memory: 14000 prefix: "builder-centos7-sandbox-x86_64" + hostVolumes: "/tmp/ccache:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-test-aarch64.yaml deleted file mode 100644 index 364e6a117..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-test-aarch64.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -templates: - - image: "fdiotools/builder-centos7:test-aarch64" - labels: "builder-centos7-test-aarch64" - prefix: "builder-centos7-test-aarch64" 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 529c2a1f9..1b58ba501 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,3 +12,4 @@ templates: labels: "builder-centos7-test-x86_64" memory: 14000 prefix: "builder-centos7-test-x86_64" + hostVolumes: "/tmp/ccache:/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 4e60a6dea..b01ee17ba 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-aarch64.yaml @@ -3,3 +3,4 @@ templates: - image: "fdiotools/builder-centos8:prod-aarch64" labels: "builder-centos8-prod-aarch64" prefix: "builder-centos8-prod-aarch64" + hostVolumes: "/tmp/ccache:/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 09ddccc2b..efba48089 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,3 +12,4 @@ templates: labels: "builder-centos8-prod-x86_64" memory: 14000 prefix: "builder-centos8-prod-x86_64" + hostVolumes: "/tmp/ccache:/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 8a0d72a34..6dd19a3a6 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-aarch64.yaml @@ -3,3 +3,4 @@ templates: - image: "fdiotools/builder-centos8:sandbox-aarch64" labels: "builder-centos8-sandbox-aarch64" prefix: "builder-centos8-sandbox-aarch64" + hostVolumes: "/tmp/ccache:/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 447ceb5cc..a5ec1c123 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,3 +12,4 @@ templates: labels: "builder-centos8-sandbox-x86_64" memory: 14000 prefix: "builder-centos8-sandbox-x86_64" + hostVolumes: "/tmp/ccache:/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 0ae69f641..e64c44a6e 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-aarch64.yaml @@ -3,3 +3,4 @@ templates: - image: "fdiotools/builder-centos8:test-aarch64" labels: "builder-centos8-test-aarch64" prefix: "builder-centos8-test-aarch64" + hostVolumes: "/tmp/ccache:/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 8868e31ec..e6fe1df6c 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,3 +12,4 @@ templates: labels: "builder-centos8-test-x86_64" memory: 14000 prefix: "builder-centos8-test-x86_64" + hostVolumes: "/tmp/ccache:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-aarch64.yaml deleted file mode 100644 index 2145da043..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-aarch64.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -templates: - - image: "fdiotools/builder-debian10:prod-aarch64" - labels: "builder-debian10-prod-aarch64" - prefix: "builder-debian10-prod-aarch64" 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 b3444f83d..27433e69b 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,3 +12,4 @@ templates: labels: "builder-debian10-prod-x86_64" memory: 14000 prefix: "builder-debian10-prod-x86_64" + hostVolumes: "/tmp/ccache:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-aarch64.yaml deleted file mode 100644 index 6cb75294e..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-aarch64.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -templates: - - image: "fdiotools/builder-debian10:sandbox-aarch64" - labels: "builder-debian10-sandbox-aarch64" - prefix: "builder-debian10-sandbox-aarch64" 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 424e5cf56..932003649 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,3 +12,4 @@ templates: labels: "builder-debian10-sandbox-x86_64" memory: 14000 prefix: "builder-debian10-sandbox-x86_64" + hostVolumes: "/tmp/ccache:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-aarch64.yaml deleted file mode 100644 index 92b9937a7..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-aarch64.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -templates: - - image: "fdiotools/builder-debian10:test-aarch64" - labels: "builder-debian10-test-aarch64" - prefix: "builder-debian10-test-aarch64" 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 359323db7..e40a09b0a 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,3 +12,4 @@ templates: labels: "builder-debian10-test-x86_64" memory: 14000 prefix: "builder-debian10-test-x86_64" + hostVolumes: "/tmp/ccache:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-prod-aarch64.yaml deleted file mode 100644 index c247c766f..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-prod-aarch64.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -templates: - - image: "fdiotools/builder-debian9:prod-aarch64" - labels: "builder-debian9-prod-aarch64" - prefix: "builder-debian9-prod-aarch64" 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 1314af8b2..d4115a536 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,3 +12,4 @@ templates: labels: "builder-debian9-prod-x86_64" memory: 14000 prefix: "builder-debian9-prod-x86_64" + hostVolumes: "/tmp/ccache:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-sandbox-aarch64.yaml deleted file mode 100644 index af1283571..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-sandbox-aarch64.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -templates: - - image: "fdiotools/builder-debian9:sandbox-aarch64" - labels: "builder-debian9-sandbox-aarch64" - prefix: "builder-debian9-sandbox-aarch64" 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 86847e130..5a3a6c767 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,3 +12,4 @@ templates: labels: "builder-debian9-sandbox-x86_64" memory: 14000 prefix: "builder-debian9-sandbox-x86_64" + hostVolumes: "/tmp/ccache:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-test-aarch64.yaml deleted file mode 100644 index ff8e981d5..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-test-aarch64.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -templates: - - image: "fdiotools/builder-debian9:test-aarch64" - labels: "builder-debian9-test-aarch64" - prefix: "builder-debian9-test-aarch64" 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 6042ed3d7..057527f16 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,3 +12,4 @@ templates: labels: "builder-debian9-test-x86_64" memory: 14000 prefix: "builder-debian9-test-x86_64" + hostVolumes: "/tmp/ccache:/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 b857ebed7..d72e1dd0d 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml @@ -3,3 +3,4 @@ templates: - image: "fdiotools/builder-ubuntu1804:prod-aarch64" labels: "builder-ubuntu1804-prod-aarch64" prefix: "builder-ubuntu1804-prod-aarch64" + hostVolumes: "/tmp/ccache:/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 d7c4ef613..b6267bef0 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,3 +12,4 @@ templates: labels: "builder-ubuntu1804-prod-x86_64" memory: 14000 prefix: "builder-ubuntu1804-prod-x86_64" + hostVolumes: "/tmp/ccache:/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 3be0f2b90..f897aa461 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml @@ -3,3 +3,4 @@ templates: - image: "fdiotools/builder-ubuntu1804:sandbox-aarch64" labels: "builder-ubuntu1804-sandbox-aarch64" prefix: "builder-ubuntu1804-sandbox-aarch64" + hostVolumes: "/tmp/ccache:/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 c28e5f894..9fd8d0c19 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,3 +12,4 @@ templates: labels: "builder-ubuntu1804-sandbox-x86_64" memory: 14000 prefix: "builder-ubuntu1804-sandbox-x86_64" + hostVolumes: "/tmp/ccache:/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 2d4481fa2..bcb41bbc3 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml @@ -3,3 +3,4 @@ templates: - image: "fdiotools/builder-ubuntu1804:test-aarch64" labels: "builder-ubuntu1804-test-aarch64" prefix: "builder-ubuntu1804-test-aarch64" + hostVolumes: "/tmp/ccache:/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 3341b2530..83691cff3 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,3 +12,4 @@ templates: labels: "builder-ubuntu1804-test-x86_64" memory: 14000 prefix: "builder-ubuntu1804-test-x86_64" + hostVolumes: "/tmp/ccache:/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 71bd7c8b7..eee2c641f 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml @@ -3,3 +3,4 @@ templates: - image: "fdiotools/builder-ubuntu2004:prod-aarch64" labels: "builder-ubuntu2004-prod-aarch64" prefix: "builder-ubuntu2004-prod-aarch64" + hostVolumes: "/tmp/ccache:/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 e4548b006..4cf8a955f 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,3 +12,4 @@ templates: labels: "builder-ubuntu2004-prod-x86_64" memory: 20000 prefix: "builder-ubuntu2004-prod-x86_64" + hostVolumes: "/tmp/ccache:/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 9f23d1965..dd4de729b 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml @@ -3,3 +3,4 @@ templates: - image: "fdiotools/builder-ubuntu2004:sandbox-aarch64" labels: "builder-ubuntu2004-sandbox-aarch64" prefix: "builder-ubuntu2004-sandbox-aarch64" + hostVolumes: "/tmp/ccache:/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 53426ed8b..3fc8d54d1 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,3 +12,4 @@ templates: labels: "builder-ubuntu2004-sandbox-x86_64" memory: 14000 prefix: "builder-ubuntu2004-sandbox-x86_64" + hostVolumes: "/tmp/ccache:/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 31b815c91..850d53acc 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml @@ -3,3 +3,4 @@ templates: - image: "fdiotools/builder-ubuntu2004:test-aarch64" labels: "builder-ubuntu2004-test-aarch64" prefix: "builder-ubuntu2004-test-aarch64" + hostVolumes: "/tmp/ccache:/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 b35cef803..5a1c326f4 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,3 +12,4 @@ templates: labels: "builder-ubuntu2004-test-x86_64" memory: 14000 prefix: "builder-ubuntu2004-test-x86_64" + hostVolumes: "/tmp/ccache:/scratch/ccache" diff --git a/jjb/scripts/setup_executor_env.sh b/jjb/scripts/setup_executor_env.sh index f6b6480f4..fbbcc5a01 100755 --- a/jjb/scripts/setup_executor_env.sh +++ b/jjb/scripts/setup_executor_env.sh @@ -59,4 +59,26 @@ ls -lh "$downloads_cache" || true 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 "CCACHE_DIR='$CCACHE_DIR' is missing, disabling CCACHE..." + unset -v CCACHE_DIR + export CCACHE_DISABLE="1" + echo "CCACHE_DISABLE='${CCACHE_DISABLE:-}'" + fi +fi echo "$long_line" |