diff --git a/.github/workflows/ci-build-macos.yaml b/.github/workflows/ci-build-macos.yaml index eaedea84d668f..49167ab107faf 100644 --- a/.github/workflows/ci-build-macos.yaml +++ b/.github/workflows/ci-build-macos.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-cpp-build-centos7.yaml b/.github/workflows/ci-cpp-build-centos7.yaml index 55151ba1cdd5c..bc480d48162f1 100644 --- a/.github/workflows/ci-cpp-build-centos7.yaml +++ b/.github/workflows/ci-cpp-build-centos7.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* paths: - '.github/workflows/**' - 'pulsar-client-cpp/**' diff --git a/.github/workflows/ci-cpp-build-windows.yaml b/.github/workflows/ci-cpp-build-windows.yaml index a287a4c3560e1..cc99204c31076 100644 --- a/.github/workflows/ci-cpp-build-windows.yaml +++ b/.github/workflows/ci-cpp-build-windows.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* paths: - '.github/workflows/**' - 'pulsar-client-cpp/**' diff --git a/.github/workflows/ci-cpp.yaml b/.github/workflows/ci-cpp.yaml index 94d1210993271..4780a938ca064 100644 --- a/.github/workflows/ci-cpp.yaml +++ b/.github/workflows/ci-cpp.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-go-functions-style.yaml b/.github/workflows/ci-go-functions-style.yaml index 4c77cf2bf47b8..d033b1a45fb9a 100644 --- a/.github/workflows/ci-go-functions-style.yaml +++ b/.github/workflows/ci-go-functions-style.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* paths: - '.github/workflows/**' - 'pulsar-function-go/**' diff --git a/.github/workflows/ci-go-functions-test.yaml b/.github/workflows/ci-go-functions-test.yaml index 37e8b81729efa..c19bc0ed7c442 100644 --- a/.github/workflows/ci-go-functions-test.yaml +++ b/.github/workflows/ci-go-functions-test.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* paths: - '.github/workflows/**' - 'pulsar-function-go/**' diff --git a/.github/workflows/ci-integration-backwards-compatibility.yaml b/.github/workflows/ci-integration-backwards-compatibility.yaml index ea9dc0d87383f..9058060b2e07d 100644 --- a/.github/workflows/ci-integration-backwards-compatibility.yaml +++ b/.github/workflows/ci-integration-backwards-compatibility.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-integration-cli.yaml b/.github/workflows/ci-integration-cli.yaml index 47af7d1193f8d..aaf4e123af5aa 100644 --- a/.github/workflows/ci-integration-cli.yaml +++ b/.github/workflows/ci-integration-cli.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-integration-function.yaml b/.github/workflows/ci-integration-function.yaml index c4f9e07d077eb..862e2a4913fb5 100644 --- a/.github/workflows/ci-integration-function.yaml +++ b/.github/workflows/ci-integration-function.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-integration-messaging.yaml b/.github/workflows/ci-integration-messaging.yaml index 00e615b73589e..c6e05f52eeb86 100644 --- a/.github/workflows/ci-integration-messaging.yaml +++ b/.github/workflows/ci-integration-messaging.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-integration-process.yaml b/.github/workflows/ci-integration-process.yaml index 404ce7a479ba8..56fa44589ee27 100644 --- a/.github/workflows/ci-integration-process.yaml +++ b/.github/workflows/ci-integration-process.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-integration-schema.yaml b/.github/workflows/ci-integration-schema.yaml index 571d22aac9c91..bb3b158b23b7f 100644 --- a/.github/workflows/ci-integration-schema.yaml +++ b/.github/workflows/ci-integration-schema.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-integration-sql.yaml b/.github/workflows/ci-integration-sql.yaml index 74951e36444b7..cfcc7b27bc946 100644 --- a/.github/workflows/ci-integration-sql.yaml +++ b/.github/workflows/ci-integration-sql.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-integration-standalone.yaml b/.github/workflows/ci-integration-standalone.yaml index 19b8bfda09a40..d8c55fb8fb99b 100644 --- a/.github/workflows/ci-integration-standalone.yaml +++ b/.github/workflows/ci-integration-standalone.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-integration-thread.yaml b/.github/workflows/ci-integration-thread.yaml index cd22c8485510d..18fcfd635444c 100644 --- a/.github/workflows/ci-integration-thread.yaml +++ b/.github/workflows/ci-integration-thread.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-integration-tiered-filesystem.yaml b/.github/workflows/ci-integration-tiered-filesystem.yaml index 3ae4fca9a36cb..8be3ac0c8db63 100644 --- a/.github/workflows/ci-integration-tiered-filesystem.yaml +++ b/.github/workflows/ci-integration-tiered-filesystem.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-integration-tiered-jcloud.yaml b/.github/workflows/ci-integration-tiered-jcloud.yaml index 2f3dc3ea902ac..cf345e331d60f 100644 --- a/.github/workflows/ci-integration-tiered-jcloud.yaml +++ b/.github/workflows/ci-integration-tiered-jcloud.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-integration-transaction.yaml b/.github/workflows/ci-integration-transaction.yaml index b53814ece11b9..b2a711144d701 100644 --- a/.github/workflows/ci-integration-transaction.yaml +++ b/.github/workflows/ci-integration-transaction.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-license.yaml b/.github/workflows/ci-license.yaml index a25eb267068a2..52bc815aea575 100644 --- a/.github/workflows/ci-license.yaml +++ b/.github/workflows/ci-license.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-shade-test.yaml b/.github/workflows/ci-shade-test.yaml index 7548ca13a2360..c3e2b42002b61 100644 --- a/.github/workflows/ci-shade-test.yaml +++ b/.github/workflows/ci-shade-test.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-unit-broker-broker-gp1.yaml b/.github/workflows/ci-unit-broker-broker-gp1.yaml index e200d61b8730f..5cd6e1af72437 100644 --- a/.github/workflows/ci-unit-broker-broker-gp1.yaml +++ b/.github/workflows/ci-unit-broker-broker-gp1.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-unit-broker-broker-gp2.yaml b/.github/workflows/ci-unit-broker-broker-gp2.yaml index 1175c0fb33185..11b79281e4676 100644 --- a/.github/workflows/ci-unit-broker-broker-gp2.yaml +++ b/.github/workflows/ci-unit-broker-broker-gp2.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-unit-broker-client-api.yaml b/.github/workflows/ci-unit-broker-client-api.yaml index 3aaba364f4fdc..fc8da0879f2c8 100644 --- a/.github/workflows/ci-unit-broker-client-api.yaml +++ b/.github/workflows/ci-unit-broker-client-api.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-unit-broker-client-impl.yaml b/.github/workflows/ci-unit-broker-client-impl.yaml index f18776a0d4942..a739062074a79 100644 --- a/.github/workflows/ci-unit-broker-client-impl.yaml +++ b/.github/workflows/ci-unit-broker-client-impl.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-unit-broker-jdk8.yaml b/.github/workflows/ci-unit-broker-jdk8.yaml index 623c3ac254179..a61def53cd4fa 100644 --- a/.github/workflows/ci-unit-broker-jdk8.yaml +++ b/.github/workflows/ci-unit-broker-jdk8.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-unit-broker-other.yaml b/.github/workflows/ci-unit-broker-other.yaml index 909813912053a..6301ae9f7e89f 100644 --- a/.github/workflows/ci-unit-broker-other.yaml +++ b/.github/workflows/ci-unit-broker-other.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-unit-proxy.yaml b/.github/workflows/ci-unit-proxy.yaml index 6911b3c23181e..105cfc390913b 100644 --- a/.github/workflows/ci-unit-proxy.yaml +++ b/.github/workflows/ci-unit-proxy.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/.github/workflows/ci-unit.yaml b/.github/workflows/ci-unit.yaml index 5715cf2310700..373df8f996132 100644 --- a/.github/workflows/ci-unit.yaml +++ b/.github/workflows/ci-unit.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - master + - branch-* push: branches: - branch-* diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java index d298147e0050f..ad3763565ccdf 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java @@ -803,7 +803,7 @@ public void testSetReplicatedSubscriptionStatus() { // 3) Create the partitioned topic response = mock(AsyncResponse.class); ArgumentCaptor responseCaptor = ArgumentCaptor.forClass(Response.class); - persistentTopics.createPartitionedTopic(response, testTenant, testNamespace, topicName, 2, false); + persistentTopics.createPartitionedTopic(response, testTenant, testNamespace, topicName, 2, true); verify(response, timeout(10000).times(1)).resume(responseCaptor.capture()); Assert.assertEquals(responseCaptor.getValue().getStatus(), Response.Status.NO_CONTENT.getStatusCode()); @@ -857,5 +857,4 @@ public void testSetReplicatedSubscriptionStatus() { verify(response, timeout(10000).times(1)).resume(responseCaptor.capture()); Assert.assertEquals(responseCaptor.getValue().getStatus(), Response.Status.NO_CONTENT.getStatusCode()); } - }