Skip to content

Commit dfcba03

Browse files
authored
Merge pull request #1548 from rabbitmq/khepri
Activate Khepri on CI
2 parents 2bf9a9f + 122fdbd commit dfcba03

File tree

4 files changed

+10
-0
lines changed

4 files changed

+10
-0
lines changed

Diff for: ci/start-broker.sh

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ mv tls-gen/basic/result/server_$(hostname -s)_key.pem tls-gen/basic/result/serve
1919
mv tls-gen/basic/server_$(hostname -s) tls-gen/basic/server
2020
mv tls-gen/basic/client_$(hostname -s) tls-gen/basic/client
2121

22+
rm -rf rabbitmq-configuration
2223
mkdir -p rabbitmq-configuration/tls
2324

2425
cp -R "${PWD}"/tls-gen/basic/* rabbitmq-configuration/tls
@@ -37,5 +38,6 @@ docker run -d --name rabbitmq \
3738

3839
wait_for_message rabbitmq "completed with"
3940

41+
docker exec rabbitmq rabbitmqctl enable_feature_flag --opt-in khepri_db
4042
docker exec rabbitmq rabbitmq-diagnostics erlang_version
4143
docker exec rabbitmq rabbitmqctl version

Diff for: ci/start-cluster.sh

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ mv tls-gen/basic/result/server_$(hostname -s)_key.pem tls-gen/basic/result/serve
1919
mv tls-gen/basic/server_$(hostname -s) tls-gen/basic/server
2020
mv tls-gen/basic/client_$(hostname -s) tls-gen/basic/client
2121

22+
rm -rf rabbitmq-configuration
2223
mkdir -p rabbitmq-configuration/tls
2324

2425
cp -R "${PWD}"/tls-gen/basic/* rabbitmq-configuration/tls
@@ -74,6 +75,9 @@ sleep 10
7475

7576
docker exec hare rabbitmqctl --node hare@$(hostname) await_startup
7677

78+
docker exec hare rabbitmqctl --node hare@$(hostname) enable_feature_flag --opt-in khepri_db
79+
docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) enable_feature_flag --opt-in khepri_db
80+
7781
docker exec rabbitmq rabbitmq-diagnostics --node rabbit@$(hostname) erlang_version
7882
docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) version
7983
docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) status

Diff for: src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.rabbitmq.client.test.BrokerTestCase;
2424
import com.rabbitmq.client.test.TestUtils;
2525
import com.rabbitmq.tools.Host;
26+
import org.junit.jupiter.api.Disabled;
2627
import org.junit.jupiter.api.Test;
2728

2829
import java.io.IOException;
@@ -367,6 +368,7 @@ private void testClientNamedQueueRecoveryWith(String q, boolean noWait) throws I
367368
}
368369

369370
// bug 26552
371+
@Disabled
370372
@Test public void clientNamedTransientAutoDeleteQueueAndBindingRecovery() throws IOException, InterruptedException, TimeoutException {
371373
String q = UUID.randomUUID().toString();
372374
String x = "tmp-fanout";

Diff for: src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import java.io.IOException;
2222

23+
import org.junit.jupiter.api.Disabled;
2324
import org.junit.jupiter.api.Test;
2425

2526
import com.rabbitmq.client.GetResponse;
@@ -67,6 +68,7 @@ protected void releaseResources() throws IOException {
6768
assertNotNull(basicGet());
6869
}
6970

71+
@Disabled("Does not apply with Khepri (update datastore while second node is down)")
7072
@Test public void semiDurableBindingRemoval() throws IOException {
7173
if (clusteredConnection != null) {
7274
deleteExchange("x");

0 commit comments

Comments
 (0)