[arvados] updated: 2.7.0-6515-gfbb541b736

[git repository hosting]

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

       via  fbb541b7364e48d83252426c5d85c46ccfb1a273 (commit)
      from  df033ed92b9991c396004855a56b6cdb32350307 (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 fbb541b7364e48d83252426c5d85c46ccfb1a273
Author: Tom Clegg <tom at curii.com>
Date:   Thu May 2 10:18:51 2024 -0400

    21611: Fix unreliable test.
    
    https://ci.arvados.org/job/developer-run-tests-remainder/4413/consoleFull
    
    FAIL: integration_test.go:1158: IntegrationSuite.TestRunTrivialContainer
    
    integration_test.go:1313:
        c.Check(allStatus, check.Matches, `Queued, waiting for dispatch\n`+
            `(Queued, waiting.*\n)*`+
            `(Locked, waiting for dispatch\n)?`+
            `(Locked, waiting for new instance to be ready\n)?`+
            `(Locked, preparing runtime environment\n)?`+
            `(Running, \n)?`+
            `Complete, \n`)
    ... value string = "" +
    ...     "Queued, waiting for dispatch\n" +
    ...     "Locked, waiting for new instance to be ready\n" +
    ...     "Locked, preparing runtime environment\n" +
    ...     "Queued, preparing runtime environment\n" +
    ...     "Locked, waiting for new instance to be ready\n" +
    ...     "Locked, preparing runtime environment\n" +
    ...     "Running, \n" +
    ...     "Complete, \n"
    
    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 6b603f178e..18a0c1992b 100644
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -1311,10 +1311,12 @@ func (s *IntegrationSuite) runContainer(c *check.C, clusterID string, token stri
 		err = ac.RequestAndDecode(&outcoll, "GET", "/arvados/v1/collections/"+cr.OutputUUID, nil, nil)
 		c.Assert(err, check.IsNil)
 		c.Check(allStatus, check.Matches, `Queued, waiting for dispatch\n`+
-			`(Queued, waiting.*\n)*`+
-			`(Locked, waiting for dispatch\n)?`+
-			`(Locked, waiting for new instance to be ready\n)?`+
-			`(Locked, preparing runtime environment\n)?`+
+			// Occasionally the dispatcher will
+			// unlock/retry, and we get state/status from
+			// database/dispatcher via separate API calls,
+			// so we can also see "Queued, preparing
+			// runtime environment".
+			`((Queued|Locked), (waiting .*|preparing runtime environment)\n)*`+
 			`(Running, \n)?`+
 			`Complete, \n`)
 	}

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


hooks/post-receive
--