Merge pull request #8534 from Pinata-Consulting/bazel-tweaks

jenkins: tweak bazel build

Author: maliberty

Jenkinsfile

@@ -223,11 +223,18 @@ def bazelTest = {
                     timeout(time: 120, unit: 'MINUTES') {
                         def cmd = 'bazelisk test --config=ci --show_timestamps --test_output=errors --curses=no --force_pic --remote_header="Authorization=Basic $BAZEL_AUTH_TOKEN_B64" --profile=build.profile'
                         try {
-                            sh label: 'Bazel Build', script: cmd + ' ...';
-                            sh label: 'Bazel Build', script: 'bazelisk analyze-profile build.profile';
+                            try {
+                                sh label: 'Test, using cached results and building a minimum of dependencies', script: cmd + ' ...';
+                            } finally {
+                                sh label: 'Analyze build times', script: 'bazelisk analyze-profile build.profile';
+                            }
                         } catch (e) {
                             currentBuild.result = 'FAILURE';
-                            sh label: 'Bazel Build (keep_going)', script: cmd + ' --keep_going ...';
+                            try {
+                                sh label: 'Test (keep_going)', script: cmd + ' --keep_going ...';
+                            } finally {
+                                sh label: 'Analyze build times', script: 'bazelisk analyze-profile build.profile';
+                            }
                         }
                     }
                 }