Add an additional attempt to get a heap histogram since jmap on Bazel CI appears to be flaky in connecting to the JVM.

PiperOrigin-RevId: 182118581

2 files changed, 6 insertions, 4 deletions

diff --git a/src/test/shell/integration/discard_graph_edges_lib.sh b/src/test/shell/integration/discard_graph_edges_lib.sh
index 0992d34433..af51665fb3 100644
--- a/src/test/shell/integration/discard_graph_edges_lib.sh
+++ b/src/test/shell/integration/discard_graph_edges_lib.sh
@@ -53,9 +53,12 @@ genrule(name = 'action${i}',
         srcs = [':action${iminus}'],
         outs = ['histo.${i}'],
         local = 1,
+        # Try to get a histogram three times because of Bazel CI flakiness.
         cmd = 'server_pid=\$\$(cat $server_pid_file) ; ' +
-              '$javabase/bin/jmap -histo:live \$\$server_pid > ' +
-              '\$(location histo.${i}) ' +
+              'for i in 1 2 3 ; do' +
+              '  $javabase/bin/jmap -histo:live \$\$server_pid > ' +
+              '      \$(location histo.${i}) && break ;' +
+              'done ' +
               '|| echo "server_pid in genrule: \$\$server_pid"'
        )
 EOF
diff --git a/src/test/shell/integration/discard_graph_edges_test.sh b/src/test/shell/integration/discard_graph_edges_test.sh
index 89c2d2b462..0ec8559979 100755
--- a/src/test/shell/integration/discard_graph_edges_test.sh
+++ b/src/test/shell/integration/discard_graph_edges_test.sh
@@ -361,8 +361,7 @@ function test_packages_cleared_implicit_noincrementality_data() {
   BUILD_FLAGS="$old_build_flags"
 }
 
-# Flaky on ci:  https://ci.bazel.build/job/bazel-tests/1710/
-function DISABLED_test_actions_deleted_after_execution_nobatch_keep_analysis () {
+function test_actions_deleted_after_execution_nobatch_keep_analysis () {
   readonly local old_startup_flags="$STARTUP_FLAGS"
   STARTUP_FLAGS="--nobatch"
   readonly local old_build_flags="$BUILD_FLAGS"