Merge #113643 #113676 #113698

113643: roachtest: move validate-after-version-upgrade to new framework r=rafiss a=rafiss The new framework provides a few more testing enhancements and is the only one that will be maintained. fixes #110535 Release note: None 113676: roachtest: fix js install command (gpg) r=rafiss a=annrpom We are seeing a `gpg: cannot open '/dev/tty': No such device or address` error from the new installation method we followed. Resolution seems to be nodejs/docker-node#922. In case we are running into an issue with machines being reused, we first check to see if we can install nodejs and npm before we add a nodesource key and deb repository (to prevent gpg: dearmoring failed: File exists) issues. (Copied from a reply to the bug report in the issue linked above) > For any script use you should anyway use --batch which disables the use of the tty as a side-effect. Fixes: #113673 Fixes: #113662 Fixes: #113659 Fixes: #113675 Fixes: #113677 Fixes: #113762 Release note: None 113698: metamorphic: add MVCC{CheckFor,}AcquireLock operations r=nvanbenschoten a=itsbilal This change adds two new operations to the MVCC metamorphic testing package that were added in #110323. We check for determinism in the storage package by adding these operations to the metamorphic tests as well. Fixes #109650. Epic: none Release note: None Co-authored-by: Rafi Shamim <[email protected]> Co-authored-by: Annie Pompa <[email protected]> Co-authored-by: Bilal Akhtar <[email protected]>
cockroachdb · Nov 3, 2023 · 17e08f8 · 17e08f8
4 parents e30d643 + e76ddd3 + e3bac44 + e16e705
commit 17e08f8
Show file tree

Hide file tree

Showing 9 changed files with 310 additions and 187 deletions.
diff --git a/pkg/cmd/roachtest/tests/acceptance.go b/pkg/cmd/roachtest/tests/acceptance.go
@@ -76,6 +76,14 @@ func registerAcceptance(r registry.Registry) {
 				numNodes: 3,
 			},
 		},
+		registry.OwnerSQLFoundations: {
+			{
+				name:          "validate-system-schema-after-version-upgrade",
+				fn:            runValidateSystemSchemaAfterVersionUpgrade,
+				timeout:       30 * time.Minute,
+				defaultLeases: true,
+			},
+		},
 	}
 	for owner, tests := range testCases {
 		for _, tc := range tests {

diff --git a/pkg/cmd/roachtest/tests/knex.go b/pkg/cmd/roachtest/tests/knex.go
@@ -59,30 +59,39 @@ func registerKnex(r registry.Registry) {
 		)
 		require.NoError(t, err)
 
-		err = repeatRunE(
-			ctx,
-			t,
-			c,
-			node,
-			"add nodesource key and deb repository",
-			`
+		// In case we are running into a state where machines are being reused, we first check to see if we
+		// can use npm to reduce the potential of trying to add another nodesource key
+		// (preventing gpg: dearmoring failed: File exists) errors.
+		err = c.RunE(
+			ctx, node, `sudo npm i -g npm`,
+		)
+
+		if err != nil {
+			err = repeatRunE(
+				ctx,
+				t,
+				c,
+				node,
+				"add nodesource key and deb repository",
+				`
 sudo apt-get update && \
 sudo apt-get install -y ca-certificates curl gnupg && \
 sudo mkdir -p /etc/apt/keyrings && \
-curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --batch --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
 echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list`,
-		)
-		require.NoError(t, err)
-
-		err = repeatRunE(
-			ctx, t, c, node, "install nodejs and npm", `sudo apt-get update && sudo apt-get -qq install nodejs`,
-		)
-		require.NoError(t, err)
-
-		err = repeatRunE(
-			ctx, t, c, node, "update npm", `sudo npm i -g npm`,
-		)
-		require.NoError(t, err)
+			)
+			require.NoError(t, err)
+
+			err = repeatRunE(
+				ctx, t, c, node, "install nodejs and npm", `sudo apt-get update && sudo apt-get -qq install nodejs`,
+			)
+			require.NoError(t, err)
+
+			err = repeatRunE(
+				ctx, t, c, node, "update npm", `sudo npm i -g npm`,
+			)
+			require.NoError(t, err)
+		}
 
 		err = repeatRunE(
 			ctx, t, c, node, "install mocha", `sudo npm i -g mocha`,

diff --git a/pkg/cmd/roachtest/tests/nodejs_postgres.go b/pkg/cmd/roachtest/tests/nodejs_postgres.go
@@ -67,30 +67,39 @@ func registerNodeJSPostgres(r registry.Registry) {
 		err = alterZoneConfigAndClusterSettings(ctx, t, version, c, node[0])
 		require.NoError(t, err)
 
-		err = repeatRunE(
-			ctx,
-			t,
-			c,
-			node,
-			"add nodesource key and deb repository",
-			`
+		// In case we are running into a state where machines are being reused, we first check to see if we
+		// can use npm to reduce the potential of trying to add another nodesource key
+		// (preventing gpg: dearmoring failed: File exists) errors.
+		err = c.RunE(
+			ctx, node, `sudo npm i -g npm`,
+		)
+
+		if err != nil {
+			err = repeatRunE(
+				ctx,
+				t,
+				c,
+				node,
+				"add nodesource key and deb repository",
+				`
 sudo apt-get update && \
 sudo apt-get install -y ca-certificates curl gnupg && \
 sudo mkdir -p /etc/apt/keyrings && \
-curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --batch --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
 echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list`,
-		)
-		require.NoError(t, err)
-
-		err = repeatRunE(
-			ctx, t, c, node, "install nodejs and npm", `sudo apt-get update && sudo apt-get -qq install nodejs`,
-		)
-		require.NoError(t, err)
-
-		err = repeatRunE(
-			ctx, t, c, node, "update npm", `sudo npm i -g npm`,
-		)
-		require.NoError(t, err)
+			)
+			require.NoError(t, err)
+
+			err = repeatRunE(
+				ctx, t, c, node, "install nodejs and npm", `sudo apt-get update && sudo apt-get -qq install nodejs`,
+			)
+			require.NoError(t, err)
+
+			err = repeatRunE(
+				ctx, t, c, node, "update npm", `sudo npm i -g npm`,
+			)
+			require.NoError(t, err)
+		}
 
 		err = repeatRunE(
 			ctx, t, c, node, "install yarn", `sudo npm i -g yarn`,

diff --git a/pkg/cmd/roachtest/tests/registry.go b/pkg/cmd/roachtest/tests/registry.go
@@ -147,7 +147,6 @@ func RegisterTests(r registry.Registry) {
 	registerTPCHVec(r)
 	registerTypeORM(r)
 	registerUnoptimizedQueryOracle(r)
-	registerValidateSystemSchemaAfterVersionUpgrade(r)
 	registerYCSB(r)
 	registerDeclarativeSchemaChangerJobCompatibilityInMixedVersion(r)
 }
diff --git a/pkg/cmd/roachtest/tests/sequelize.go b/pkg/cmd/roachtest/tests/sequelize.go
@@ -93,32 +93,39 @@ func registerSequelize(r registry.Registry) {
 			t.Fatal(err)
 		}
 
-		if err := repeatRunE(
-			ctx,
-			t,
-			c,
-			node,
-			"add nodesource key and deb repository",
-			`
+		// In case we are running into a state where machines are being reused, we first check to see if we
+		// can use npm to reduce the potential of trying to add another nodesource key
+		// (preventing gpg: dearmoring failed: File exists) errors.
+		if err := c.RunE(
+			ctx, node, `sudo npm i -g npm`,
+		); err != nil {
+			if err := repeatRunE(
+				ctx,
+				t,
+				c,
+				node,
+				"add nodesource key and deb repository",
+				`
 sudo apt-get update && \
 sudo apt-get install -y ca-certificates curl gnupg && \
 sudo mkdir -p /etc/apt/keyrings && \
-curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --batch --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
 echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list`,
-		); err != nil {
-			t.Fatal(err)
-		}
-
-		if err := repeatRunE(
-			ctx, t, c, node, "install nodejs and npm", `sudo apt-get update && sudo apt-get -qq install nodejs`,
-		); err != nil {
-			t.Fatal(err)
-		}
-
-		if err := repeatRunE(
-			ctx, t, c, node, "update npm", `sudo npm i -g npm`,
-		); err != nil {
-			t.Fatal(err)
+			); err != nil {
+				t.Fatal(err)
+			}
+
+			if err := repeatRunE(
+				ctx, t, c, node, "install nodejs and npm", `sudo apt-get update && sudo apt-get -qq install nodejs`,
+			); err != nil {
+				t.Fatal(err)
+			}
+
+			if err := repeatRunE(
+				ctx, t, c, node, "update npm", `sudo npm i -g npm`,
+			); err != nil {
+				t.Fatal(err)
+			}
 		}
 
 		if err := repeatRunE(

diff --git a/pkg/cmd/roachtest/tests/typeorm.go b/pkg/cmd/roachtest/tests/typeorm.go
@@ -89,32 +89,39 @@ func registerTypeORM(r registry.Registry) {
 			t.Fatal(err)
 		}
 
-		if err := repeatRunE(
-			ctx,
-			t,
-			c,
-			node,
-			"add nodesource key and deb repository",
-			`
+		// In case we are running into a state where machines are being reused, we first check to see if we
+		// can use npm to reduce the potential of trying to add another nodesource key
+		// (preventing gpg: dearmoring failed: File exists) errors.
+		if err := c.RunE(
+			ctx, node, `sudo npm i -g npm`,
+		); err != nil {
+			if err := repeatRunE(
+				ctx,
+				t,
+				c,
+				node,
+				"add nodesource key and deb repository",
+				`
 sudo apt-get update && \
 sudo apt-get install -y ca-certificates curl gnupg && \
 sudo mkdir -p /etc/apt/keyrings && \
-curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --batch --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
 echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list`,
-		); err != nil {
-			t.Fatal(err)
-		}
+			); err != nil {
+				t.Fatal(err)
+			}
 
-		if err := repeatRunE(
-			ctx, t, c, node, "install nodejs and npm", `sudo apt-get update && sudo apt-get -qq install nodejs`,
-		); err != nil {
-			t.Fatal(err)
-		}
+			if err := repeatRunE(
+				ctx, t, c, node, "install nodejs and npm", `sudo apt-get update && sudo apt-get -qq install nodejs`,
+			); err != nil {
+				t.Fatal(err)
+			}
 
-		if err := repeatRunE(
-			ctx, t, c, node, "update npm", `sudo npm i -g npm`,
-		); err != nil {
-			t.Fatal(err)
+			if err := repeatRunE(
+				ctx, t, c, node, "update npm", `sudo npm i -g npm`,
+			); err != nil {
+				t.Fatal(err)
+			}
 		}
 
 		if err := repeatRunE(