From db22e3df3600e531a19877ec2d21fa8103ea3726 Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Thu, 11 Nov 2021 14:53:56 -0300
Subject: [PATCH] test(rlog): reenable RLOG FVT tests

The RLOG DB backend tests in FVT were temporarily disabled due to some
paho tests being specially flaky in CI.

In particular, those tests had the common pattern of subscribing to a
topic, immediately publishing to that topic and then waiting for the
response.  When in CI and using RLOG, there seems to be more delays in
replication of data, and often this pattern would fail in the
constraint testing enviroment.
---
 .../docker-compose-emqx-cluster-rlog.override.yaml         | 4 ++++
 .ci/docker-compose-file/python/pytest.sh                   | 2 +-
 .github/workflows/run_fvt_tests.yaml                       | 7 +++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.ci/docker-compose-file/docker-compose-emqx-cluster-rlog.override.yaml b/.ci/docker-compose-file/docker-compose-emqx-cluster-rlog.override.yaml
index 8be146eb5..1b61b0278 100644
--- a/.ci/docker-compose-file/docker-compose-emqx-cluster-rlog.override.yaml
+++ b/.ci/docker-compose-file/docker-compose-emqx-cluster-rlog.override.yaml
@@ -12,6 +12,7 @@ services:
   emqx1:
     <<: *default-emqx
     container_name: node1.emqx.io
+    restart: on-failure
     environment:
       - "EMQX_HOST=node1.emqx.io"
       - "EMQX_CLUSTER__DB_BACKEND=rlog"
@@ -23,6 +24,9 @@ services:
   emqx2:
     <<: *default-emqx
     container_name: node2.emqx.io
+    depends_on:
+      - emqx1
+    restart: on-failure
     environment:
       - "EMQX_HOST=node2.emqx.io"
       - "EMQX_CLUSTER__DB_BACKEND=rlog"
diff --git a/.ci/docker-compose-file/python/pytest.sh b/.ci/docker-compose-file/python/pytest.sh
index c079a65a4..bb020ddc9 100755
--- a/.ci/docker-compose-file/python/pytest.sh
+++ b/.ci/docker-compose-file/python/pytest.sh
@@ -18,7 +18,7 @@ else
 fi
 
 apk update && apk add git curl
-git clone -b develop-4.0 https://github.com/emqx/paho.mqtt.testing.git /paho.mqtt.testing
+git clone -b develop-4.0-2 https://github.com/thalesmg/paho.mqtt.testing.git /paho.mqtt.testing
 pip install pytest
 
 pytest -v /paho.mqtt.testing/interoperability/test_client/V5/test_connect.py -k test_basic --host "$TARGET_HOST"
diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml
index 0b5295cac..560bf15c8 100644
--- a/.github/workflows/run_fvt_tests.yaml
+++ b/.github/workflows/run_fvt_tests.yaml
@@ -73,8 +73,7 @@ jobs:
           - 24.1.1-emqx-1
         cluster_db_backend:
           - "mnesia"
-          # FIXME: temporarily disabled: too flaky at the moment
-          # - "rlog"
+          - "rlog"
 
     steps:
     - uses: actions/download-artifact@v2
@@ -182,8 +181,8 @@ jobs:
         kubectl logs emqx-2
     - uses: actions/checkout@v2
       with:
-        repository: emqx/paho.mqtt.testing
-        ref: develop-4.0
+        repository: thalesmg/paho.mqtt.testing
+        ref: develop-4.0-2
         path: paho.mqtt.testing
     - name: install pytest
       run: |