Merge #155244

craig[bot] · aerfrei · craig[bot] · commit bf25721cad99 · 2025-10-22T15:20:56.000Z
155244: changefeedccl: revert #152703, do not needlessly omit kafka r=arg0451,log-head a=aerfrei We were omitting kafka for this test in response to a failure we saw on s390x, with which kafka is incompatible. That failure was due to an unrelated issue. Since these kafka sink tests do not run the kafka client, they are not expected to fail on s390x. Informs: #152703 Epic: none Release note: None Co-authored-by: Aerin Freilich <aerin.freilich@cockroachlabs.com>
diff --git a/pkg/ccl/changefeedccl/protected_timestamps_test.go b/pkg/ccl/changefeedccl/protected_timestamps_test.go
@@ -155,8 +155,7 @@ func TestChangefeedUpdateProtectedTimestamp(t *testing.T) {
 		}
 	}
 
-	// Skip kafka sink because it's not compatible with s390x/IBM architecture
-	cdcTestWithSystem(t, testFn, feedTestEnterpriseSinks, feedTestOmitSinks("kafka"))
+	cdcTestWithSystem(t, testFn, feedTestEnterpriseSinks)
 }
 
 // TestChangefeedProtectedTimestamps asserts the state of changefeed PTS records

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,7 @@ func TestChangefeedUpdateProtectedTimestamp(t *testing.T) {`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
`158`		`- // Skip kafka sink because it's not compatible with s390x/IBM architecture`
`159`		`- cdcTestWithSystem(t, testFn, feedTestEnterpriseSinks, feedTestOmitSinks("kafka"))`
	`158`	`+ cdcTestWithSystem(t, testFn, feedTestEnterpriseSinks)`
`160`	`159`	`}`
`161`	`160`
`162`	`161`	`// TestChangefeedProtectedTimestamps asserts the state of changefeed PTS records`