You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2025/10/31 11:27:27 UTC
(pulsar) 02/03: [improve][ci] Move replication tests to new group Broker Group 5 in Pulsar CI (#24917)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit ff2c9ece11b0d5b2af6c34cea9eba6a5d592f045
Author: Lari Hotari <lh...@users.noreply.github.com>
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 | 4 ++++
.../pulsar/broker/SameAuthParamsLookupAutoClusterFailoverTest.java | 1 +
.../java/org/apache/pulsar/broker/service/AbstractReplicatorTest.java | 2 +-
.../service/DisabledCreateTopicToRemoteClusterForReplicationTest.java | 2 +-
.../pulsar/broker/service/OneWayReplicatorDeduplicationTest.java | 2 +-
.../java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java | 2 +-
.../broker/service/OneWayReplicatorUsingGlobalPartitionedTest.java | 2 +-
.../pulsar/broker/service/OneWayReplicatorUsingGlobalZKTest.java | 2 +-
.../java/org/apache/pulsar/broker/service/PeerReplicatorTest.java | 4 ++--
.../java/org/apache/pulsar/broker/service/ReplicationTopicGcTest.java | 2 +-
.../pulsar/broker/service/ReplicationTopicGcUsingGlobalZKTest.java | 2 +-
.../java/org/apache/pulsar/broker/service/ReplicationTxnTest.java | 2 +-
.../java/org/apache/pulsar/broker/service/ReplicatorAdminTlsTest.java | 2 +-
.../pulsar/broker/service/ReplicatorAdminTlsWithKeyStoreTest.java | 2 +-
.../java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java | 2 +-
.../org/apache/pulsar/broker/service/ReplicatorRateLimiterTest.java | 2 +-
.../org/apache/pulsar/broker/service/ReplicatorRemoveClusterTest.java | 2 +-
.../org/apache/pulsar/broker/service/ReplicatorSubscriptionTest.java | 2 +-
.../broker/service/ReplicatorSubscriptionWithTransactionTest.java | 2 +-
.../test/java/org/apache/pulsar/broker/service/ReplicatorTest.java | 2 +-
.../test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java | 2 +-
.../org/apache/pulsar/broker/service/ReplicatorTopicPoliciesTest.java | 2 +-
.../pulsar/broker/service/TransactionalReplicateSubscriptionTest.java | 1 +
.../service/persistent/PersistentReplicatorInflightTaskTest.java | 2 +-
25 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/pulsar-ci.yaml b/.github/workflows/pulsar-ci.yaml
index 68d484ecd36..6128441cb1a 100644
--- a/.github/workflows/pulsar-ci.yaml
+++ b/.github/workflows/pulsar-ci.yaml
@@ -192,6 +192,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 723653b2265..2ea2b0bafd0 100755
--- a/build/run_unit_group.sh
+++ b/build/run_unit_group.sh
@@ -93,6 +93,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 532c4b7858b..af501442fd4 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
@@ -50,7 +50,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 8a195a5f48f..3281bdb8c8f 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
@@ -90,7 +90,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 798f4047bfe..4ffb34a2b7f 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
@@ -122,7 +122,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 9f4a81b8d0b..c298b37a0e2 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,7 +46,7 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@Slf4j
-@Test(groups = "broker")
+@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 12febb0620b..c33bda24b23 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 01ace3672f6..cc255b52fe8 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 c09809d4ad8..8492087f3f1 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
@@ -47,7 +47,7 @@ import org.testng.annotations.Test;
* 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 f038fee7504..e8856026a16 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 a5b7b4f3e6b..0467f885367 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
@@ -120,7 +120,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_");