From e1af47f4cacc71cbe6bb28d1a44c263ddc11d989 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 28 Nov 2019 18:37:20 -0500 Subject: [PATCH] Jenkins ccache don't reset previous statistics (only print) --- .ci/Jenkinsfile-SITL_tests | 2 +- .ci/Jenkinsfile-SITL_tests_ASan | 2 +- .ci/Jenkinsfile-SITL_tests_coverage | 2 +- .ci/Jenkinsfile-compile | 2 +- .ci/Jenkinsfile-compile_mac | 6 +++--- .ci/Jenkinsfile-hardware | 20 ++++++++++---------- .ci/Jenkinsfile-hardware_linux | 2 +- .ci/Jenkinsfile-hardware_snapdragon | 2 +- Jenkinsfile | 12 ++++++------ 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests index 995229b127..8e8e6f647b 100644 --- a/.ci/Jenkinsfile-SITL_tests +++ b/.ci/Jenkinsfile-SITL_tests @@ -15,7 +15,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make px4_sitl_default' sh 'make px4_sitl_default sitl_gazebo' diff --git a/.ci/Jenkinsfile-SITL_tests_ASan b/.ci/Jenkinsfile-SITL_tests_ASan index 5c144f17e4..d54592b8b1 100644 --- a/.ci/Jenkinsfile-SITL_tests_ASan +++ b/.ci/Jenkinsfile-SITL_tests_ASan @@ -15,7 +15,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make px4_sitl_default' sh 'make px4_sitl_default sitl_gazebo' diff --git a/.ci/Jenkinsfile-SITL_tests_coverage b/.ci/Jenkinsfile-SITL_tests_coverage index 9a8cdc1cd7..b6b1ff7b0a 100644 --- a/.ci/Jenkinsfile-SITL_tests_coverage +++ b/.ci/Jenkinsfile-SITL_tests_coverage @@ -148,7 +148,7 @@ def createTestNode(Map test_def) { try { sh('make distclean') sh 'git fetch --tags' - sh('ccache -z') + sh('ccache -s') sh('make px4_sitl_default') sh('make px4_sitl_default sitl_gazebo') sh('ccache -s') diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile index fa62c29534..2b01ecac66 100644 --- a/.ci/Jenkinsfile-compile +++ b/.ci/Jenkinsfile-compile @@ -122,7 +122,7 @@ def createBuildNode(Boolean archive, String docker_image, String target) { checkout(scm) sh('make distclean') sh('git fetch --tags') - sh('ccache -z') + sh('ccache -s') sh('make ' + target) sh('ccache -s') sh('make sizes') diff --git a/.ci/Jenkinsfile-compile_mac b/.ci/Jenkinsfile-compile_mac index ef6a4c9ced..4c4af4a3c0 100644 --- a/.ci/Jenkinsfile-compile_mac +++ b/.ci/Jenkinsfile-compile_mac @@ -19,7 +19,7 @@ pipeline { sh 'export' sh 'make distclean' sh 'git fetch --tags' - sh 'ccache -z' + sh 'ccache -s' sh 'make px4_sitl_default' sh 'ccache -s' } @@ -41,7 +41,7 @@ pipeline { sh 'export' sh 'make distclean' sh 'git fetch --tags' - sh 'ccache -z' + sh 'ccache -s' sh 'make px4_fmu-v5_default' sh 'ccache -s' } @@ -63,7 +63,7 @@ pipeline { sh 'export' sh 'make distclean' sh 'git fetch --tags' - sh 'ccache -z' + sh 'ccache -s' sh 'make tests' sh 'ccache -s' } diff --git a/.ci/Jenkinsfile-hardware b/.ci/Jenkinsfile-hardware index da33b4f2da..bb7535647c 100644 --- a/.ci/Jenkinsfile-hardware +++ b/.ci/Jenkinsfile-hardware @@ -19,7 +19,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make px4_fmu-v2_test' sh 'make sizes' @@ -89,7 +89,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make px4_fmu-v3_default' sh 'make sizes' @@ -180,7 +180,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make px4_fmu-v4_default' sh 'make sizes' @@ -270,7 +270,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make px4_fmu-v4pro_default' sh 'make sizes' @@ -361,7 +361,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make px4_fmu-v5_default' sh 'make sizes' @@ -452,7 +452,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make px4_fmu-v5x_default' sh 'make sizes' @@ -543,7 +543,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make modalai_fc-v1_default' sh 'make sizes' @@ -633,7 +633,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make holybro_durandal-v1_default' sh 'make sizes' @@ -725,7 +725,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make holybro_durandal-v1_stackcheck' sh 'make sizes' @@ -815,7 +815,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make nxp_fmuk66-v3_default' sh 'make sizes' diff --git a/.ci/Jenkinsfile-hardware_linux b/.ci/Jenkinsfile-hardware_linux index 9e8d8fc6b7..1dd5236eaa 100644 --- a/.ci/Jenkinsfile-hardware_linux +++ b/.ci/Jenkinsfile-hardware_linux @@ -11,7 +11,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'CCACHE_BASEDIR=${WORKSPACE} make emlid_navio2_native' sh 'ccache -s' diff --git a/.ci/Jenkinsfile-hardware_snapdragon b/.ci/Jenkinsfile-hardware_snapdragon index 1bea67de30..c8994d8873 100644 --- a/.ci/Jenkinsfile-hardware_snapdragon +++ b/.ci/Jenkinsfile-hardware_snapdragon @@ -11,7 +11,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'CCACHE_BASEDIR=${WORKSPACE} make eagle_default' sh 'ccache -s' diff --git a/Jenkinsfile b/Jenkinsfile index 436577f835..3065343ba6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -104,7 +104,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make px4_fmu-v2_default' sh 'make px4_fmu-v2_default bloaty_compileunits' @@ -137,7 +137,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make px4_fmu-v5_default' sh 'make px4_fmu-v5_default bloaty_compileunits' @@ -170,7 +170,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make px4_sitl_default' sh 'make px4_sitl_default bloaty_compileunits' @@ -203,7 +203,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make px4_fmu-v5_default' sh 'make sizes' @@ -229,7 +229,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make px4_sitl_default' sh 'make sizes' @@ -255,7 +255,7 @@ pipeline { steps { sh 'export' sh 'make distclean' - sh 'ccache -z' + sh 'ccache -s' sh 'git fetch --tags' sh 'make tests' sh 'ccache -s'