diff options
| author |   Vanessa Valderrama <vvalderrama@linuxfoundation.org> | 2023-08-22 13:48:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2023-08-22 13:48:51 +0000 |
| commit | 6eb48ef838d3968c94f707dde5c686b1b5a23f0f (patch) | |
| tree | ba278e8aea01a1b9068e8678e00a68153c5b90f2 /jjb | |
| parent | a9dcab7a8ef57f3c41feabc2301013df40e5d79f (diff) | |
| parent | dd69cd845711ab131a91fcee26364300875cfb31 (diff) | |
Merge "vpp: disable ccache for gcc builds"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/scripts/vpp/cov-build.sh | 4 | ||||
| -rw-r--r-- | jjb/scripts/vpp/gcc-build.sh | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/jjb/scripts/vpp/cov-build.sh b/jjb/scripts/vpp/cov-build.sh index 7cfa82e6..15f86c3b 100644 --- a/jjb/scripts/vpp/cov-build.sh +++ b/jjb/scripts/vpp/cov-build.sh @@ -62,7 +62,7 @@ make_test_coverage_report() { BUILD_ERROR="FAILED 'make test-dep'" return fi - if ! make UNATTENDED=yes pkg-verify ; then + if ! make UNATTENDED=yes CCACHE_DISABLE=1 pkg-verify ; then BUILD_ERROR="FAILED 'make pkg-verify'" return fi @@ -85,7 +85,7 @@ make_test_coverage_report() { fi fi if grep -q "${OS_ID}-${OS_VERSION_ID}" <<< "${MAKE_TEST_OS}"; then - if ! make COMPRESS_FAILED_TEST_LOGS=yes TEST_JOBS="$TEST_JOBS" test-cov ; then + if ! make COMPRESS_FAILED_TEST_LOGS=yes TEST_JOBS="$TEST_JOBS" CCACHE_DISABLE=1 test-cov ; then BUILD_ERROR="FAILED 'make test-cov'" return fi diff --git a/jjb/scripts/vpp/gcc-build.sh b/jjb/scripts/vpp/gcc-build.sh index 1d816004..9bd6d4ff 100644 --- a/jjb/scripts/vpp/gcc-build.sh +++ b/jjb/scripts/vpp/gcc-build.sh @@ -36,11 +36,11 @@ make_build_release_build_test_gcov_sanity() { BUILD_ERROR="FAILED 'make install-ext-deps'" return fi - if ! make UNATTENDED=yes build-release ; then - BUILD_ERROR="FAILED 'make build'" + if ! make UNATTENDED=yes CCACHE_DISABLE=1 build-release ; then + BUILD_ERROR="FAILED 'make build-release'" return fi - if ! make UNATTENDED=yes build ; then + if ! make UNATTENDED=yes CCACHE_DISABLE=1 build ; then BUILD_ERROR="FAILED 'make build'" return fi @@ -56,12 +56,12 @@ make_build_release_build_test_gcov_sanity() { # then update this accordingly. For now pick a few basic suites... MAKE_TEST_SUITES="vlib vppinfra vpe_api vapi cli bihash" for suite in $MAKE_TEST_SUITES ; do - if ! make UNATTENDED=yes TESTS_GCOV=1 TEST_JOBS="$TEST_JOBS" TEST=$suite test ; then - BUILD_ERROR="FAILED 'make TESTS_GCOV=1 TEST_JOBS=$TEST_JOBS TEST=$suite test'!" + if ! make UNATTENDED=yes CCACHE_DISABLE=1 TESTS_GCOV=1 TEST_JOBS="$TEST_JOBS" TEST=$suite test ; then + BUILD_ERROR="FAILED 'make TEST=$suite test'!" return fi - if ! make UNATTENDED=yes TESTS_GCOV=1 TEST_JOBS="$TEST_JOBS" TEST=$suite test-debug ; then - BUILD_ERROR="FAILED 'make TESTS_GCOV=1 TEST_JOBS=$TEST_JOBS TEST=$suite test-debug'!" + if ! make UNATTENDED=yes CCACHE_DISABLE=1 TESTS_GCOV=1 TEST_JOBS="$TEST_JOBS" TEST=$suite test-debug ; then + BUILD_ERROR="FAILED 'make TEST=$suite test-debug'!" return fi done |