diff options
31 files changed, 44 insertions, 47 deletions
diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh index a2e5c98a0..725aedcca 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 34bc40c7f..45204210e 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 4e165e6e0..27c297a1c 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 95b451f16..446ca3f8e 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 6a52ded16..0b0b4fcf4 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 1b58ba501..633e78f5c 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 b01ee17ba..e24578d6e 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 efba48089..7b59d1b9f 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 6dd19a3a6..b43bf9cbf 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 a5ec1c123..f91a943e9 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 e64c44a6e..daf222d19 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 e6fe1df6c..ac7200c24 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 27433e69b..d15a462a4 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 932003649..8e2293a57 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 e40a09b0a..d49a0ba2c 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 d4115a536..edb1482bc 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 5a3a6c767..d94dcebef 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 057527f16..66c0604d1 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 d72e1dd0d..60bee47b5 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 b6267bef0..8bde8f376 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 f897aa461..af7f2c27c 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 9fd8d0c19..58c86ce50 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 bcb41bbc3..a1b9011fa 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 83691cff3..c3ff4524d 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 eee2c641f..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,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 4cf8a955f..113055840 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 dd4de729b..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,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 3fc8d54d1..b218c615c 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 850d53acc..a277684d3 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 5a1c326f4..58f661c8c 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 f9aecfa40..a6b8216d6 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" |