Merge #95291 #95358 #95389

95291: grunning: exclude s390x r=rickystewart a=vivkong

As the patched Go runtime is not available, disable grunning library on s390x.

When s390x artifacts are made available (#92393), we can re-enable the library.  

Thanks.

Release note: None
Epic: none

95358: logictest: add a skip_if_retry for new_schema_changer txn r=ajwerner a=ajwerner

Epic: none

Fixes: #94884

Release note: None

95389: streamingest: replication cutover timestamp test fix r=lidorcarmel a=lidorcarmel

A recent test was using hlc.GoTime() instead of hlc.AsOfSystemTime().

Fixes: #95196
Epic: none

Release note: None

Co-authored-by: Vivian Kong <[email protected]>
Co-authored-by: Andrew Werner <[email protected]>
Co-authored-by: Lidor Carmel <[email protected]>

pkg/ccl/streamingccl/streamingest/replication_stream_e2e_test.go

@@ -945,11 +945,12 @@ func TestTenantStreamingShowTenant(t *testing.T) {
 	require.GreaterOrEqual(t, protectedTime, replicationDetails.ReplicationStartTime.GoTime())
 	require.Nil(t, cutoverTime)
 
-	// Verify the SHOW command prints the right cutover timestamp.
-	futureTime := c.DestSysServer.Clock().Now().Add(24*time.Hour.Nanoseconds(), 0)
+	// Verify the SHOW command prints the right cutover timestamp. Adding some
+	// logical component to make sure we handle it correctly.
+	futureTime := c.DestSysServer.Clock().Now().Add(24*time.Hour.Nanoseconds(), 7)
 	var cutoverStr string
 	c.DestSysSQL.QueryRow(c.T, `ALTER TENANT $1 COMPLETE REPLICATION TO SYSTEM TIME $2::string`,
-		c.Args.DestTenantName, futureTime.GoTime()).Scan(&cutoverStr)
+		c.Args.DestTenantName, futureTime.AsOfSystemTime()).Scan(&cutoverStr)
 	var showCutover string
 	c.DestSysSQL.QueryRow(c.T, fmt.Sprintf("SELECT cutover_time FROM [SHOW TENANT %s WITH REPLICATION STATUS]",
 		c.Args.DestTenantName)).Scan(&showCutover)

pkg/sql/logictest/testdata/logic_test/new_schema_changer

@@ -1422,6 +1422,8 @@ INSERT INTO t VALUES (1), (2), (3)
 statement ok
 SET use_declarative_schema_changer = 'unsafe_always';
 
+skip_on_retry
+
 statement ok
 BEGIN
 

pkg/util/grunning/BUILD.bazel

@@ -184,8 +184,6 @@ go_test(
         ],
         "@io_bazel_rules_go//go/platform:linux_s390x": [
             ":grunning",
-            "//pkg/testutils/skip",
-            "//pkg/util/syncutil",
             "@com_github_stretchr_testify//require",
         ],
         "@io_bazel_rules_go//go/platform:netbsd_386": [

pkg/util/grunning/disabled.go

@@ -10,8 +10,8 @@
 
 // See grunning.Supported() for an explanation behind this build tag.
 //
-//go:build (darwin && arm64) || freebsd || !bazel
-// +build darwin,arm64 freebsd !bazel
+//go:build (darwin && arm64) || freebsd || (linux && s390x) || !bazel
+// +build darwin,arm64 freebsd linux,s390x !bazel
 
 package grunning
 

pkg/util/grunning/disabled_test.go

@@ -10,8 +10,8 @@
 
 // See grunning.Supported() for an explanation behind this build tag.
 //
-//go:build (darwin && arm64) || freebsd || !bazel
-// +build darwin,arm64 freebsd !bazel
+//go:build (darwin && arm64) || freebsd || (linux && s390x) || !bazel
+// +build darwin,arm64 freebsd linux,s390x !bazel
 
 package grunning_test
 

pkg/util/grunning/enabled.go

@@ -10,9 +10,10 @@
 
 // See grunning.Supported() for an explanation behind this build tag.
 //
-//go:build !((darwin && arm64) || freebsd || !bazel)
+//go:build !((darwin && arm64) || freebsd || (linux && s390x) || !bazel)
 // +build !darwin !arm64
 // +build !freebsd
+// +build !linux !s390x
 // +build bazel
 
 package grunning

pkg/util/grunning/enabled_test.go

@@ -10,9 +10,10 @@
 
 // See grunning.Supported() for an explanation behind this build tag.
 //
-//go:build !((darwin && arm64) || freebsd || !bazel)
+//go:build !((darwin && arm64) || freebsd || (linux && s390x) || !bazel)
 // +build !darwin !arm64
 // +build !freebsd
+// +build !linux !s390x
 // +build bazel
 
 package grunning_test