Merge branch '2.3.x'

.github/workflows/modoboa.yml

@@ -5,7 +5,7 @@ name: Modoboa App
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, 2.3.x ]
     paths-ignore:
       - 'modoboa/**.po'
       - 'frontend/**'
@@ -104,7 +104,7 @@ jobs:
         run: |
           pip install -e .[mysql]
           echo "DB=mysql" >> $GITHUB_ENV
-      - name: Test with pytest
+      - name: Run tests
         if: ${{ matrix.python-version != '3.12' || matrix.database != 'postgres' }}
         run: |
           python ./tests.py
@@ -121,7 +121,26 @@ jobs:
           REDIS_PORT: ${{ job.services.redis.ports[6379] }}
           LDAP_SERVER_PORT: ${{ job.services.openldap.ports[389] }}
 
-      - name: Test with pytest and coverage
+      - name: Start redis sentinel
+        if: ${{ matrix.python-version == '3.12' && matrix.database == 'postgres' }}
+        uses: hoverkraft-tech/compose-action@v2.0.1
+        with:
+          compose-file: "./docker/compose.redis-sentinel.yml"
+
+      - name: Run tests againt redis sentinel
+        if: ${{ matrix.python-version == '3.12' && matrix.database == 'postgres' }}
+        run: |
+          cd test_project
+          coverage run manage.py test modoboa.policyd
+        env:
+          POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }}
+          REDIS_SENTINEL: 1
+          REDIS_SENTINEL_HOST: localhost
+          REDIS_SENTINEL_PORT: 26379
+          REDIS_MASTER: mymaster
+          OIDC_RSA_PRIVATE_KEY: ${{ vars.OIDC_RSA_PRIVATE_KEY }}
+
+      - name: Run tests and coverage
         if: ${{ matrix.python-version == '3.12' && matrix.database == 'postgres' }}
         run: |
           python ./tests.py