This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch branch-3.3 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit efa49a1614410335f1422601c777a650586eb68f Author: Lari Hotari <[email protected]> AuthorDate: Wed Oct 29 19:46:03 2025 +0200 [improve][ci] Move replication tests to new group Broker Group 5 in Pulsar CI (#24917) (cherry picked from commit f55d45a51b9862240f2139104c16533a29636240) --- .github/workflows/pulsar-ci.yaml | 2 ++ build/run_unit_group.sh | 6 +++++- .../pulsar/broker/SameAuthParamsLookupAutoClusterFailoverTest.java | 1 + .../org/apache/pulsar/broker/service/AbstractReplicatorTest.java | 2 +- .../DisabledCreateTopicToRemoteClusterForReplicationTest.java | 2 +- .../pulsar/broker/service/OneWayReplicatorDeduplicationTest.java | 2 +- .../java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java | 2 +- .../broker/service/OneWayReplicatorUsingGlobalPartitionedTest.java | 4 +--- .../pulsar/broker/service/OneWayReplicatorUsingGlobalZKTest.java | 2 +- .../java/org/apache/pulsar/broker/service/PeerReplicatorTest.java | 4 ++-- .../org/apache/pulsar/broker/service/ReplicationTopicGcTest.java | 2 +- .../pulsar/broker/service/ReplicationTopicGcUsingGlobalZKTest.java | 2 +- .../java/org/apache/pulsar/broker/service/ReplicationTxnTest.java | 2 +- .../org/apache/pulsar/broker/service/ReplicatorAdminTlsTest.java | 2 +- .../pulsar/broker/service/ReplicatorAdminTlsWithKeyStoreTest.java | 2 +- .../org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java | 2 +- .../org/apache/pulsar/broker/service/ReplicatorRateLimiterTest.java | 2 +- .../apache/pulsar/broker/service/ReplicatorRemoveClusterTest.java | 2 +- .../apache/pulsar/broker/service/ReplicatorSubscriptionTest.java | 2 +- .../broker/service/ReplicatorSubscriptionWithTransactionTest.java | 2 +- .../test/java/org/apache/pulsar/broker/service/ReplicatorTest.java | 2 +- .../java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java | 2 +- .../apache/pulsar/broker/service/ReplicatorTopicPoliciesTest.java | 2 +- .../broker/service/TransactionalReplicateSubscriptionTest.java | 1 + .../service/persistent/PersistentReplicatorInflightTaskTest.java | 2 +- 25 files changed, 31 insertions(+), 25 deletions(-) diff --git a/.github/workflows/pulsar-ci.yaml b/.github/workflows/pulsar-ci.yaml index 7f4dd9f199c..d1ca65f9457 100644 --- a/.github/workflows/pulsar-ci.yaml +++ b/.github/workflows/pulsar-ci.yaml @@ -249,6 +249,8 @@ jobs: group: BROKER_GROUP_3 - name: Brokers - Broker Group 4 group: BROKER_GROUP_4 + - name: Brokers - Broker Group 5 + group: BROKER_GROUP_5 - name: Brokers - Client Api group: BROKER_CLIENT_API - name: Brokers - Client Impl diff --git a/build/run_unit_group.sh b/build/run_unit_group.sh index 1e09eaf83b9..73d105e720d 100755 --- a/build/run_unit_group.sh +++ b/build/run_unit_group.sh @@ -82,7 +82,7 @@ function test_group_broker_group_1() { } function test_group_broker_group_2() { - mvn_test -pl pulsar-broker -Dgroups='schema,utils,functions-worker,broker-io,broker-discovery,broker-compaction,broker-naming,broker-replication,websocket,other' + mvn_test -pl pulsar-broker -Dgroups='schema,utils,functions-worker,broker-io,broker-discovery,broker-compaction,broker-naming,websocket,other' } function test_group_broker_group_3() { @@ -95,6 +95,10 @@ function test_group_broker_group_4() { mvn_test -pl pulsar-broker -Dgroups='cluster-migration' } +function test_group_broker_group_5() { + mvn_test -pl pulsar-broker -Dgroups='broker-replication' +} + function test_group_broker_client_api() { mvn_test -pl pulsar-broker -Dgroups='broker-api' } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/SameAuthParamsLookupAutoClusterFailoverTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/SameAuthParamsLookupAutoClusterFailoverTest.java index 19859d17d50..0a2a74d9a22 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/SameAuthParamsLookupAutoClusterFailoverTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/SameAuthParamsLookupAutoClusterFailoverTest.java @@ -42,6 +42,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +@Test(groups = "broker-replication") public class SameAuthParamsLookupAutoClusterFailoverTest extends OneWayReplicatorTestBase { public void setup() throws Exception { diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractReplicatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractReplicatorTest.java index 3b09461e7b0..b36b69f390e 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractReplicatorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractReplicatorTest.java @@ -51,7 +51,7 @@ import org.awaitility.reflect.WhiteboxImpl; import org.testng.Assert; import org.testng.annotations.Test; -@Test(groups = "broker") +@Test(groups = "broker-replication") public class AbstractReplicatorTest { @Test diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/DisabledCreateTopicToRemoteClusterForReplicationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/DisabledCreateTopicToRemoteClusterForReplicationTest.java index 0f8db4aaa73..75e2c548829 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/DisabledCreateTopicToRemoteClusterForReplicationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/DisabledCreateTopicToRemoteClusterForReplicationTest.java @@ -44,7 +44,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @Slf4j -@Test(groups = "broker") +@Test(groups = "broker-replication") public class DisabledCreateTopicToRemoteClusterForReplicationTest extends OneWayReplicatorTestBase { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorDeduplicationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorDeduplicationTest.java index 237935f05c6..baa8ce93f91 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorDeduplicationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorDeduplicationTest.java @@ -91,7 +91,7 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @Slf4j -@Test(groups = "broker") +@Test(groups = "broker-replication") public class OneWayReplicatorDeduplicationTest extends OneWayReplicatorTestBase { static final ObjectMapper JACKSON = new ObjectMapper(); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java index 38f8c4b08c0..5c3a747bf41 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java @@ -126,7 +126,7 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @Slf4j -@Test(groups = "broker") +@Test(groups = "broker-replication") public class OneWayReplicatorTest extends OneWayReplicatorTestBase { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorUsingGlobalPartitionedTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorUsingGlobalPartitionedTest.java index 1c4bcbfb10c..a929c3bce0f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorUsingGlobalPartitionedTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorUsingGlobalPartitionedTest.java @@ -46,9 +46,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @Slf4j -// TODO: This test is in flaky group until CI is fixed. -// To be addressed as part of https://github.com/apache/pulsar/pull/24154 -@Test(groups = "flaky") +@Test(groups = "broker-replication") public class OneWayReplicatorUsingGlobalPartitionedTest extends OneWayReplicatorTest { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorUsingGlobalZKTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorUsingGlobalZKTest.java index d2c23d67cd3..f1324ce8b7d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorUsingGlobalZKTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorUsingGlobalZKTest.java @@ -44,7 +44,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @Slf4j -@Test(groups = "broker") +@Test(groups = "broker-replication") public class OneWayReplicatorUsingGlobalZKTest extends OneWayReplicatorTest { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java index 9f655921794..8de6a7a448d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java @@ -44,7 +44,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -@Test(groups = "broker") +@Test(groups = "broker-replication") public class PeerReplicatorTest extends ReplicatorTestBase { @Override @@ -187,7 +187,7 @@ public class PeerReplicatorTest extends ReplicatorTestBase { * * @throws Exception */ - @Test(groups = "broker") + @Test public void testPeerClusterInReplicationClusterListChange() throws Exception { // clean up peer-clusters diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicationTopicGcTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicationTopicGcTest.java index 852e33b8e7c..b31d1c755e7 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicationTopicGcTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicationTopicGcTest.java @@ -45,7 +45,7 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @Slf4j -@Test(groups = "broker") +@Test(groups = "broker-replication") public class ReplicationTopicGcTest extends OneWayReplicatorTestBase { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicationTopicGcUsingGlobalZKTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicationTopicGcUsingGlobalZKTest.java index ce6eddc5698..fabfb3333e9 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicationTopicGcUsingGlobalZKTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicationTopicGcUsingGlobalZKTest.java @@ -25,7 +25,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @Slf4j -@Test(groups = "broker") +@Test(groups = "broker-replication") public class ReplicationTopicGcUsingGlobalZKTest extends ReplicationTopicGcTest { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicationTxnTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicationTxnTest.java index 3caf4a1f239..aa67474207a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicationTxnTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicationTxnTest.java @@ -59,7 +59,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @Slf4j -@Test(groups = "broker") +@Test(groups = "broker-replication") public class ReplicationTxnTest extends OneWayReplicatorTestBase { private boolean transactionBufferSegmentedSnapshotEnabled = false; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorAdminTlsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorAdminTlsTest.java index a5d14ca0487..eb3fce6b307 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorAdminTlsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorAdminTlsTest.java @@ -31,7 +31,7 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -@Test(groups = "broker") +@Test(groups = "broker-replication") public class ReplicatorAdminTlsTest extends ReplicatorTestBase { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorAdminTlsWithKeyStoreTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorAdminTlsWithKeyStoreTest.java index 3d3eb3faa72..3c0af6b429f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorAdminTlsWithKeyStoreTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorAdminTlsWithKeyStoreTest.java @@ -31,7 +31,7 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -@Test(groups = "broker") +@Test(groups = "broker-replication") public class ReplicatorAdminTlsWithKeyStoreTest extends ReplicatorTestBase { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java index 514e0207fbf..b2668ad765f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java @@ -52,7 +52,7 @@ import java.util.concurrent.TimeUnit; * a lot of topic deletion and makes namespace policies being incorrect. */ @Slf4j -@Test(groups = "broker-impl") +@Test(groups = "broker-replication") public class ReplicatorGlobalNSTest extends ReplicatorTestBase { protected String methodName; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRateLimiterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRateLimiterTest.java index d92bc6005fd..90254bd971d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRateLimiterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRateLimiterTest.java @@ -47,7 +47,7 @@ import org.testng.annotations.Test; /** * Starts 3 brokers that are in 3 different clusters */ -@Test(groups = "quarantine") +@Test(groups = "broker-replication") public class ReplicatorRateLimiterTest extends ReplicatorTestBase { protected String methodName; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRemoveClusterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRemoveClusterTest.java index 4a74966a3b6..5040947816b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRemoveClusterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRemoveClusterTest.java @@ -39,7 +39,7 @@ import org.testng.annotations.Test; /** * Starts 3 brokers that are in 3 different clusters */ -@Test(groups = "broker") +@Test(groups = "broker-replication") public class ReplicatorRemoveClusterTest extends ReplicatorTestBase { protected String methodName; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorSubscriptionTest.java index 19689537fd4..c393ead3688 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorSubscriptionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorSubscriptionTest.java @@ -78,7 +78,7 @@ import org.testng.annotations.Test; /** * Tests replicated subscriptions (PIP-33) */ -@Test(groups = "broker") +@Test(groups = "broker-replication") public class ReplicatorSubscriptionTest extends ReplicatorTestBase { private static final Logger log = LoggerFactory.getLogger(ReplicatorSubscriptionTest.class); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorSubscriptionWithTransactionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorSubscriptionWithTransactionTest.java index 93a22a851f1..3907b4e8c6f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorSubscriptionWithTransactionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorSubscriptionWithTransactionTest.java @@ -26,7 +26,7 @@ import org.testng.annotations.Test; /** * Tests replicated subscriptions with transaction (PIP-33) */ -@Test(groups = "broker") +@Test(groups = "broker-replication") public class ReplicatorSubscriptionWithTransactionTest extends ReplicatorSubscriptionTest { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java index cd078fd89f9..1604cb7f061 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java @@ -119,7 +119,7 @@ import org.testng.annotations.Test; /** * Starts 3 brokers that are in 3 different clusters */ -@Test(groups = "broker") +@Test(groups = "broker-replication") public class ReplicatorTest extends ReplicatorTestBase { protected String methodName; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java index 49e4e795394..7a8e62d8e47 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java @@ -30,7 +30,7 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -@Test(groups = "broker") +@Test(groups = "broker-replication") public class ReplicatorTlsTest extends ReplicatorTestBase { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTopicPoliciesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTopicPoliciesTest.java index 9a138ed583a..8879dbf80f0 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTopicPoliciesTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTopicPoliciesTest.java @@ -58,7 +58,7 @@ import org.testng.annotations.Test; /** * Starts 3 brokers that are in 3 different clusters */ -@Test(groups = "broker") +@Test(groups = "broker-replication") public class ReplicatorTopicPoliciesTest extends ReplicatorTestBase { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionalReplicateSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionalReplicateSubscriptionTest.java index 2d348f82597..188c4d078d3 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionalReplicateSubscriptionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionalReplicateSubscriptionTest.java @@ -49,6 +49,7 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; +@Test(groups = "broker-replication") public class TransactionalReplicateSubscriptionTest extends ReplicatorTestBase { @Override @BeforeClass(timeOut = 300000) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentReplicatorInflightTaskTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentReplicatorInflightTaskTest.java index 31970f499fd..9eb3fff9676 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentReplicatorInflightTaskTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentReplicatorInflightTaskTest.java @@ -46,7 +46,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @Slf4j -@Test(groups = "broker") +@Test(groups = "broker-replication") public class PersistentReplicatorInflightTaskTest extends OneWayReplicatorTestBase { private final String topicName = BrokerTestUtil.newUniqueName("persistent://" + replicatedNamespace + "/tp_");
