diff options
35 files changed, 77 insertions, 92 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..cdb22abf 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,5 @@ 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" + memory: 16000 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..11f7c388 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,5 @@ 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" + memory: 16000 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..a07af004 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,5 @@ 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" + memory: 16000 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/global-macros.yaml b/jjb/global-macros.yaml index 42ed9078..efa1e17c 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -203,14 +203,6 @@ name: TOPO default: '{topo}' description: "Topology parameter" - -- parameter: - name: workspace-archive-artifacts-parameter - parameters: - - string: - name: WS_ARCHIVE_ARTIFACTS - default: '{artifacts}' - description: "Artifacts to archive in $WORKSPACE/archives." # [end] Keep 'parameter' entries ordered alphabetically, please. #### SCMS diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml index c3bc9107..93d3b9de 100644 --- a/jjb/hicn/hicn.yaml +++ b/jjb/hicn/hicn.yaml @@ -230,7 +230,7 @@ os: "{os}" - repo-name-parameter: repo-name: "{repo-stream-part}.ubuntu.bionic.main" - - workspace-archive-artifacts-parameter: + - archive-artifacts-parameter: artifacts: '{archive-artifacts}' scm: @@ -321,7 +321,7 @@ repo-name: "{repo-stream-part}.{repo-os-part}" - stream-parameter: stream: "{stream}" - - workspace-archive-artifacts-parameter: + - archive-artifacts-parameter: artifacts: '{archive-artifacts}' scm: @@ -379,7 +379,7 @@ stream: "{repository-name}" - repo-name-parameter: repo-name: "{repo-stream-part}.{repo-os-part}" - - workspace-archive-artifacts-parameter: + - archive-artifacts-parameter: artifacts: '{archive-artifacts}' scm: @@ -473,7 +473,7 @@ repo-name: "{repo-stream-part}.{repo-os-part}" - stream-parameter: stream: "{stream}" - - workspace-archive-artifacts-parameter: + - archive-artifacts-parameter: artifacts: '{archive-artifacts}' scm: @@ -539,7 +539,7 @@ stream: "hicn" - repo-name-parameter: repo-name: "{repo-stream-part}.{repo-os-part}" - - workspace-archive-artifacts-parameter: + - archive-artifacts-parameter: artifacts: '{archive-artifacts}' scm: diff --git a/jjb/scripts/post_build_deploy_archives.sh b/jjb/scripts/post_build_deploy_archives.sh index 79fa05a1..355d6fd4 100755 --- a/jjb/scripts/post_build_deploy_archives.sh +++ b/jjb/scripts/post_build_deploy_archives.sh @@ -48,6 +48,9 @@ STACKTRACE="" # Returns stacktrace filename in STACKTRACE generate_vpp_stacktrace_and_delete_core() { local corefile="$1" + echo "Uncompressing core file $file" + gunzip "$corefile" + corefile="${corefile::(-3)}" if grep -qe 'debug' <<< "$WORKSPACE" ; then local binfile="$WORKSPACE/build-root/install-vpp_debug-native/vpp/bin/vpp" else @@ -61,8 +64,9 @@ generate_vpp_stacktrace_and_delete_core() { echo "Removing core file: $corefile" rm -f "$corefile" # Dump stacktrace to console log - if [ -f $STACKTRACE ] ; then + if [ -f "$STACKTRACE" ] ; then echo -e "\n=====[ $STACKTRACE ]=====\n$(cat $STACKTRACE)\n=====[ $STACKTRACE ]=====\n" + gzip "$STACKTRACE" else echo "Stacktrace file not generated!" STACKTRACE="" @@ -77,30 +81,12 @@ env > $BUILD_ENV_LOG echo "ARCHIVE_ARTIFACTS = '$ARCHIVE_ARTIFACTS'" if [ -n "${ARCHIVE_ARTIFACTS:-}" ] ; then - pushd $WORKSPACE + pushd "$WORKSPACE" shopt -s globstar # Enable globstar to copy archives for file in $ARCHIVE_ARTIFACTS ; do if [ -f "$file" ] ; then - fname="$(basename $file)" - # Decompress core.gz file - if grep -qe '^core.*\.gz$' <<<"$fname" ; then - echo "Uncompressing core file $file" - gunzip "$file" - file="${file::(-3)}" - fi - # Convert core file to stacktrace - if [ "${fname::4}" = "core" ] ; then - generate_vpp_stacktrace_and_delete_core $file - [ -z "$STACKTRACE" ] && continue - file=$STACKTRACE - fi - # Set destination filename - if [ "${file::26}" = "/tmp/vpp-failed-unittests/" ] ; then - destfile=$WS_ARCHIVES_DIR${file:25} - else - destfile=$WS_ARCHIVE_DIR$file - fi echo "Archiving '$file' to '$destfile'" + destfile="$WS_ARCHIVE_DIR$file" destdir="$(dirname $destfile)" mkdir -p $destdir mv -f $file $destfile @@ -122,5 +108,15 @@ find $WS_ARCHIVES_DIR -type f -print0 \ | cut -d: -f1 \ | xargs -d'\n' -r gzip +# generate stack trace for VPP core files for upload instead of core file. +if [ -d "$WORKSPACE/build-root" ] ; then + for file in $(find $WS_ARCHIVES_DIR -type f -name 'core*.gz') ; do + generate_vpp_stacktrace_and_delete_core $file + done +fi + +# Remove any socket files in archive +find $WS_ARCHIVES_DIR -type s -exec rm -rf {} \; + echo "Workspace archived artifacts:" ls -alR $WS_ARCHIVES_DIR 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" diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 2f015d4b..ccd636bc 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -70,7 +70,6 @@ project: 'vpp' make-parallel-jobs: '4' make-test-os: 'ubuntu-20.04' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' stream: - master: branch: 'master' @@ -127,7 +126,6 @@ project: 'vpp' make-parallel-jobs: '4' make-test-os: 'ubuntu-20.04' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' comment-trigger-value: 'debug-verify' stream: - master: @@ -191,7 +189,6 @@ project: 'vpp' make-parallel-jobs: '16' make-test-os: 'ubuntu-20.04' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' stream: - master: branch: 'master' @@ -388,6 +385,8 @@ # Please keep parameters in alphabetical order parameters: + - archive-artifacts-parameter: + artifacts: '{archive-artifacts}' - gerrit-parameter: branch: '{branch}' - gerrit-refspec-parameter: @@ -398,8 +397,6 @@ project: '{project}' - repo-name-parameter: repo-name: '{repo-stream-part}.ubuntu.bionic.main' - - workspace-archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -505,6 +502,8 @@ # Please keep parameters in alphabetical order parameters: + - archive-artifacts-parameter: + artifacts: '{archive-artifacts}' - gerrit-parameter: branch: '{branch}' - gerrit-refspec-parameter: @@ -521,8 +520,6 @@ repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' - - workspace-archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -573,6 +570,8 @@ # Please keep parameters in alphabetical order parameters: + - archive-artifacts-parameter: + artifacts: '{archive-artifacts}' - gerrit-parameter: branch: '{branch}' - gerrit-refspec-parameter: @@ -589,8 +588,6 @@ repo-name: '{repo-stream-part}.ubuntu.bionic.main' - stream-parameter: stream: '{stream}' - - workspace-archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -656,7 +653,7 @@ repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' - - workspace-archive-artifacts-parameter: + - archive-artifacts-parameter: artifacts: '{archive-artifacts}' scm: @@ -737,7 +734,7 @@ repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' - - workspace-archive-artifacts-parameter: + - archive-artifacts-parameter: artifacts: '{archive-artifacts}' scm: |