[arvados] updated: 2.1.0-2613-gb44ac131b

[git repository hosting]

Summary of changes:
 lib/controller/integration_test.go | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

       via  b44ac131b7385af241acdcbf3835f743ea590b6a (commit)
      from  d805410033037ba6d3dd3538dc802ff1ba9065b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b44ac131b7385af241acdcbf3835f743ea590b6a
Author: Tom Clegg <tom at curii.com>
Date:   Wed Jun 22 09:56:18 2022 -0400

    19166: Account for auto-retry in integration test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index 67d60197e..65d34315a 100644
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -1189,15 +1189,21 @@ func (s *IntegrationSuite) runContainer(c *check.C, clusterID string, ctrSpec ma
 	deadline := time.Now().Add(time.Minute)
 wait:
 	for ; ; lastState = ctr.State {
+		if time.Now().After(deadline) {
+			c.Errorf("timed out, container request state is %q", cr.State)
+			showlogs(ctr.Log)
+			c.FailNow()
+		}
 		err = ac.RequestAndDecode(&ctr, "GET", "/arvados/v1/containers/"+cr.ContainerUUID, nil, nil)
-		c.Assert(err, check.IsNil)
+		if err != nil {
+			// container req is being auto-retried with a new container uuid
+			ac.RequestAndDecode(&cr, "GET", "/arvados/v1/container_requests/"+cr.UUID, nil, nil)
+			c.Assert(err, check.IsNil)
+			time.Sleep(time.Second / 2)
+			continue
+		}
 		switch ctr.State {
 		case lastState:
-			if time.Now().After(deadline) {
-				c.Errorf("timed out, container request state is %q", cr.State)
-				showlogs(ctr.Log)
-				c.FailNow()
-			}
 			time.Sleep(time.Second / 2)
 		case arvados.ContainerStateComplete:
 			break wait

-----------------------------------------------------------------------


hooks/post-receive
--