From 3ee09f14f62d1ba760b547e4e4283667f2a0cc14 Mon Sep 17 00:00:00 2001
From: Kyle Wong <37189875+kyle-a-wong@users.noreply.github.com>
Date: Fri, 15 Nov 2024 15:54:08 -0500
Subject: [PATCH] roachtest: fix "context cancelled" errors in db-console tests

changes the context used when writing cypress artifacts to
the test artifact directory. This is needed because the
existing context is getting cancelled, pressumable when
`rtCluster.RunE(ctx...` fails.

Adds `-e NO_COLOR=1` to the docker run command so that the
output is more humanreadable in log files

Updates the tests to use `registry.StandardCockroach`. By
default, `registry.RandomizedCockroach` is used, and
`registry.RuntimeAssertionsCockroach` is built using
`cockroach-short`, which does not include db-console in
the binary.

Epic: none
Release note: None
---
 pkg/cmd/roachtest/tests/db_console.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkg/cmd/roachtest/tests/db_console.go b/pkg/cmd/roachtest/tests/db_console.go
index c69888e04ac9..1e33874d20e3 100644
--- a/pkg/cmd/roachtest/tests/db_console.go
+++ b/pkg/cmd/roachtest/tests/db_console.go
@@ -114,7 +114,7 @@ func (d *dbConsoleCypressTest) RunTest(ctx context.Context, targetNode int, l *l
 	url := fmt.Sprintf("https://%s", adminUIAddrs[0])
 	require.NoError(d.t, rtCluster.RunE(ctx, option.WithNodes(workloadNode), "mkdir", "-p", d.artifactPath))
 	dockerRun := fmt.Sprintf(
-		`docker run -v %s:/e2e/artifacts %s --config baseUrl=%s,screenshotsFolder=/e2e/artifacts,videosFolder=/e2e/artifacts %s`,
+		`docker run -e NO_COLOR=1 -v %s:/e2e/artifacts %s --config baseUrl=%s,screenshotsFolder=/e2e/artifacts,videosFolder=/e2e/artifacts %s`,
 		d.artifactPath, d.imageName, url, specStr)
 	// If the Docker run fails, get the test failure artifacts and write them to
 	// roachtest's artifact directory.
@@ -123,7 +123,7 @@ func (d *dbConsoleCypressTest) RunTest(ctx context.Context, targetNode int, l *l
 		if mkDirErr := os.MkdirAll(testArtifactsDir, 0777); mkDirErr != nil {
 			d.t.Fatal(mkDirErr)
 		}
-		require.NoError(d.t, rtCluster.Get(ctx, d.t.L(), d.artifactPath, testArtifactsDir, workloadNode))
+		require.NoError(d.t, rtCluster.Get(context.Background(), d.t.L(), d.artifactPath, testArtifactsDir, workloadNode))
 		d.t.Fatal(err)
 	}
 }
@@ -195,11 +195,16 @@ func (d *dbConsoleCypressTest) writeCypressFilesToWorkloadNode(ctx context.Conte
 }
 
 func registerDbConsole(r registry.Registry) {
+	// Explicitly set CockroachBinary to registry.StandardCockroach to ensure that a binary
+	// containing db console is used. Currently, registry.RuntimeAssertionsCockroach
+	// is built using cockroach-short and the default of registry.RandomizedCockroach
+	// causes the tests to be flaky
 	r.Add(registry.TestSpec{
 		Name:             "db-console/mixed-version-cypress",
 		Owner:            registry.OwnerObservability,
 		Cluster:          r.MakeClusterSpec(5, spec.WorkloadNode()),
 		CompatibleClouds: registry.AllClouds,
+		CockroachBinary:  registry.StandardCockroach,
 		Suites:           registry.Suites(registry.Nightly),
 		Randomized:       false,
 		Run:              runDbConsoleCypressMixedVersions,
@@ -210,6 +215,7 @@ func registerDbConsole(r registry.Registry) {
 		Owner:            registry.OwnerObservability,
 		Cluster:          r.MakeClusterSpec(4, spec.WorkloadNode()),
 		CompatibleClouds: registry.AllClouds,
+		CockroachBinary:  registry.StandardCockroach,
 		Suites:           registry.Suites(registry.Nightly),
 		Randomized:       false,
 		Run:              runDbConsoleCypress,