Reorganize pipeline actions (#3951)

* Update latest redis srv image for the CI pipeline test matrix

* Reorganizing the pipeline actions - separate actions for protocol 2 and protocol 3.

Author: petyaslavova

.github/actions/run-tests/action.yml

@@ -22,6 +22,10 @@ inputs:
     description: 'Event loop to use'
     required: false
     default: 'asyncio'
+  protocol:
+    description: 'RESP protocol version to use'
+    required: false
+    default: 'all'
   repository:
     description: 'Repository to checkout'
     required: false
@@ -164,8 +168,12 @@ runs:
           echo "::endgroup::"
         }
 
-        run_tests 2 "${{inputs.event-loop}}"
-        run_tests 3 "${{inputs.event-loop}}"
+        if [ "${{inputs.protocol}}" == "all" ]; then
+          run_tests 2 "${{inputs.event-loop}}"
+          run_tests 3 "${{inputs.event-loop}}"
+        else
+          run_tests "${{inputs.protocol}}" "${{inputs.event-loop}}"
+        fi
       shell: bash
 
     - name: Debug
@@ -181,7 +189,7 @@ runs:
     - name: Upload test results and profiling data
       uses: actions/upload-artifact@v4
       with:
-        name: pytest-results-redis_${{inputs.redis-version}}-python_${{inputs.python-version}}-parser_${{env.PARSER_BACKEND}}-el_${{inputs.event-loop}}
+        name: pytest-results-redis_${{inputs.redis-version}}-python_${{inputs.python-version}}-parser_${{env.PARSER_BACKEND}}-el_${{inputs.event-loop}}-protocol_${{inputs.protocol}}
         path: |
           *-results.xml
           prof/**

.github/workflows/integration.yaml

@@ -31,7 +31,7 @@ env:
   # for example after 8.2.1 is published, 8.2 image contains 8.2.1 content
   CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG: '8.4.0'
   CURRENT_REDIS_VERSION: '8.4.0'
-  REDIS_VERSION_CUSTOM_MAP: 'custom-21651605017-debian-amd64:8.6'
+  REDIS_VERSION_CUSTOM_MAP: 'custom-21860421418-debian-amd64:8.6'
 
 jobs:
   dependency-audit:
@@ -74,16 +74,17 @@ jobs:
     timeout-minutes: 60
     needs: redis_version
     strategy:
-      max-parallel: 15
+      max-parallel: 30
       fail-fast: false
       matrix:
-        redis-version: ['custom-21651605017-debian-amd64', '${{ needs.redis_version.outputs.CURRENT }}', '8.2', '8.0.2' ,'7.4.4', '7.2.9']
+        redis-version: ['custom-21860421418-debian-amd64', '${{ needs.redis_version.outputs.CURRENT }}', '8.2', '8.0.2' ,'7.4.4', '7.2.9']
         python-version: ['3.10', '3.14']
         parser-backend: ['plain']
         event-loop: ['asyncio']
+        protocol: ['2', '3']
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-    name: Redis ${{ matrix.redis-version }}; Python ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}}; EL:${{matrix.event-loop}}
+    name: Redis ${{ matrix.redis-version }}; Python ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}}; EL:${{matrix.event-loop}}; Protocol:${{matrix.protocol}}
     steps:
       - uses: actions/checkout@v6
       - name: Run tests
@@ -92,22 +93,24 @@ jobs:
             python-version: ${{ matrix.python-version }}
             parser-backend: ${{ matrix.parser-backend }}
             redis-version: ${{ matrix.redis-version }}
+            protocol: ${{ matrix.protocol }}
 
   python-compatibility-tests:
     runs-on: ubuntu-latest
     needs: [ redis_version ]
     timeout-minutes: 60
     strategy:
-      max-parallel: 15
+      max-parallel: 30
       fail-fast: false
       matrix:
         redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
-        python-version: ['3.11', '3.12', '3.13', 'pypy-3.10', 'pypy-3.11']
+        python-version: ['3.11', '3.12', '3.13']
         parser-backend: [ 'plain' ]
         event-loop: [ 'asyncio' ]
+        protocol: ['2', '3']
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-    name: Redis ${{ matrix.redis-version }}; Python ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}}; EL:${{matrix.event-loop}}
+    name: Redis ${{ matrix.redis-version }}; Python ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}}; EL:${{matrix.event-loop}}; Protocol:${{matrix.protocol}}
     steps:
       - uses: actions/checkout@v6
       - name: Run tests
@@ -116,23 +119,54 @@ jobs:
           python-version: ${{ matrix.python-version }}
           parser-backend: ${{ matrix.parser-backend }}
           redis-version: ${{ matrix.redis-version }}
+          protocol: ${{ matrix.protocol }}
+
+  pypy-compatibility-tests:
+    runs-on: ubuntu-latest
+    needs: [ redis_version ]
+    # in pipeline ofter these pypy jobs hang, so their timeout is set
+    # to just 40 minutes - close to the max time the jobs are running at the moment
+    # adding more tests will make them even slower, and we will need to adjust the timeout
+    timeout-minutes: 40
+    strategy:
+      max-parallel: 30
+      fail-fast: false
+      matrix:
+        redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
+        python-version: ['pypy-3.10', 'pypy-3.11']
+        parser-backend: [ 'plain' ]
+        event-loop: [ 'asyncio' ]
+        protocol: ['2', '3']
+    env:
+      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+    name: PyPy Redis ${{ matrix.redis-version }}; ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}}; EL:${{matrix.event-loop}}; Protocol:${{matrix.protocol}}
+    steps:
+      - uses: actions/checkout@v6
+      - name: Run tests
+        uses: ./.github/actions/run-tests
+        with:
+          python-version: ${{ matrix.python-version }}
+          parser-backend: ${{ matrix.parser-backend }}
+          redis-version: ${{ matrix.redis-version }}
+          protocol: ${{ matrix.protocol }}
 
   hiredis-tests:
     runs-on: ubuntu-latest
     needs: [redis_version]
     timeout-minutes: 60
     strategy:
-      max-parallel: 15
+      max-parallel: 30
       fail-fast: false
       matrix:
         redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
         python-version: [ '3.10', '3.14']
         parser-backend: [ 'hiredis' ]
         hiredis-version: [ '>=3.2.0', '<3.0.0' ]
         event-loop: [ 'asyncio' ]
+        protocol: ['2', '3']
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-    name: Redis ${{ matrix.redis-version }}; Python ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}} (${{ matrix.hiredis-version }}); EL:${{matrix.event-loop}}
+    name: Redis ${{ matrix.redis-version }}; Python ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}} (${{ matrix.hiredis-version }}); EL:${{matrix.event-loop}}; Protocol:${{matrix.protocol}}
     steps:
       - uses: actions/checkout@v6
       - name: Run tests
@@ -142,22 +176,24 @@ jobs:
           parser-backend: ${{ matrix.parser-backend }}
           redis-version: ${{ matrix.redis-version }}
           hiredis-version: ${{ matrix.hiredis-version }}
+          protocol: ${{ matrix.protocol }}
 
   uvloop-tests:
     runs-on: ubuntu-latest
     needs: [redis_version]
     timeout-minutes: 60
     strategy:
-      max-parallel: 15
+      max-parallel: 30
       fail-fast: false
       matrix:
         redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
         python-version: [ '3.10', '3.14' ]
         parser-backend: [ 'plain' ]
         event-loop: [ 'uvloop' ]
+        protocol: ['2', '3']
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-    name: Redis ${{ matrix.redis-version }}; Python ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}}; EL:${{matrix.event-loop}}
+    name: Redis ${{ matrix.redis-version }}; Python ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}}; EL:${{matrix.event-loop}}; Protocol:${{matrix.protocol}}
     steps:
       - uses: actions/checkout@v6
       - name: Run tests
@@ -167,6 +203,7 @@ jobs:
           parser-backend: ${{ matrix.parser-backend }}
           redis-version: ${{ matrix.redis-version }}
           event-loop: ${{ matrix.event-loop }}
+          protocol: ${{ matrix.protocol }}
 
   build-and-test-package:
     name: Validate building and installing the package