From 851bdc004fe7ef890d18e402d196f2755ef9894b Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Tue, 8 Dec 2020 15:21:36 -0800
Subject: [PATCH] Give probe tests a second chance to pass

...and bump up their timeout, since that seems more likely to happen if
we have to retry.

Change-Id: Ie05521f6cd146234dc5615c96ad19681b43e9110
(cherry picked from commit d4c0a7d3b3106f8b491e78ea21fca36c99ad04d9)
---
 .zuul.yaml                          | 2 +-
 tools/playbooks/probetests/run.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 1ea7bd5aea..c773094bfe 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -244,7 +244,7 @@
     nodeset: centos-7
     description: |
       Setup a SAIO dev environment and run Swift's probe tests
-    timeout: 5400
+    timeout: 7200
     pre-run:
       - tools/playbooks/common/install_dependencies.yaml
       - tools/playbooks/saio_single_node_setup/setup_saio.yaml
diff --git a/tools/playbooks/probetests/run.yaml b/tools/playbooks/probetests/run.yaml
index 912b19aaa3..323b52cb72 100644
--- a/tools/playbooks/probetests/run.yaml
+++ b/tools/playbooks/probetests/run.yaml
@@ -21,6 +21,6 @@
       shell:
         cmd: |
           source ~/.bashrc
-          nosetests test/probe/
+          nosetests test/probe/ --with-id || nosetests --failed
         executable: /bin/bash
         chdir: '{{ zuul.project.src_dir }}'