Update integration.yml

Author: uglide

.github/workflows/integration.yml

@@ -15,126 +15,45 @@ concurrency:
   group: ${{ github.event.pull_request.number || github.ref }}-integration
   cancel-in-progress: true
 
-jobs:
-  enterprise-tests:
-    name: Redis Enterprise
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        enterprise_version: ['7.4.2-54']
-        env_file_mode: ['enterprise', 'enterprise_oss_cluster']
+env:
+  CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+  REDIS_IMAGE: redis:latest
+  REDIS_STACK_IMAGE: redis/redis-stack-server:latest
+  CURRENT_REDIS_VERSION: '7.4.1'
 
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Load dotnenv for CI
-        uses: xom9ikk/dotenv@v2
-        with:
-          path: .github/workflows/modes
-          mode: ${{ matrix.env_file_mode }}
-
-      - name: Clone ee docker code
-        uses: actions/checkout@v4
-        with:
-          repository: redislabs/redis-ee-docker
-          path: redis-ee-docker
-
-      - name: Start docker
-        working-directory: redis-ee-docker
-        env:
-          IMAGE: redislabs/redis:${{ matrix.enterprise_version }}
-        run: ./build.sh
-
-      - name: .NET Core 8
-        uses: actions/setup-dotnet@v2
-        with:
-          dotnet-version: '8.0.x'
-
-      - name: Restore dependencies
-        run: dotnet restore
-
-      - name: Build
-        run: dotnet build --no-restore /p:ContinuousIntegrationBuild=true
-
-      - name: Test
-        run: dotnet test -f net8.0 --no-build --verbosity detailed -p:BuildInParallel=false tests/Test.proj --logger GitHubActions
-
-  dotnet_6_cluster:
-    name: .NET 6 on [redis-stack cluster]
-    uses: ./.github/workflows/reusable.yml
-    with:
-      redis_stack_type: cluster
-      clr_version: net6.0
-      mode: oss_cluster
-      dotnet_sdk_version: 6.0.0
-    secrets: inherit
-
-  dotnet_6:
-    name: .NET 6 on [redis-stack ${{matrix.redis-stack-type}}]
-    uses: ./.github/workflows/reusable.yml
-    strategy:
-      fail-fast: false
-      max-parallel: 5
-      matrix:
-        redis-stack-type: ['edge', '6.2.6', '7.2.0-RC3']
-    with:
-      redis_stack_type: ${{matrix.redis-stack-type}}
-      clr_version: net6.0
-      mode: standalone
-      dotnet_sdk_version: 6.0.0
-    secrets: inherit
-
-  dotnet_7_cluster:
-    name: .NET 7 on [redis-stack cluster]
-    uses: ./.github/workflows/reusable.yml
-    with:
-      redis_stack_type: cluster
-      clr_version: net7.0
-      mode: oss_cluster
-      dotnet_sdk_version: 7.0.0
-    secrets: inherit
-
-  dotnet_7:
-    name: .NET 7 on [redis-stack ${{matrix.redis-stack-type}}]
-    uses: ./.github/workflows/reusable.yml
-    strategy:
-      fail-fast: false
-      max-parallel: 5
-      matrix:
-        redis-stack-type: ['edge', '6.2.6', '7.2.0-RC3']
-    with:
-      redis_stack_type: ${{matrix.redis-stack-type}}
-      clr_version: net7.0
-      mode: standalone
-      dotnet_sdk_version: 7.0.0
-    secrets: inherit
-
-  dotnet_8_cluster:
-    name: .NET 8 on [redis-stack cluster]
-    uses: ./.github/workflows/reusable.yml
-    with:
-      redis_stack_type: cluster
-      clr_version: net8.0
-      mode: oss_cluster
-      dotnet_sdk_version: 8.0.0
-    secrets: inherit
-
-  dotnet_8:
-    name: .NET 8 on [redis-stack ${{matrix.redis-stack-type}}]
-    uses: ./.github/workflows/reusable.yml
-    strategy:
-      fail-fast: false
-      max-parallel: 5
-      matrix:
-        redis-stack-type: ['edge', '6.2.6', '7.2.0-RC3']
-    with:
-      redis_stack_type: ${{matrix.redis-stack-type}}
-      clr_version: net8.0
-      mode: standalone
-      dotnet_sdk_version: 8.0.0
-    secrets: inherit
+jobs:
+    redis_version:
+      runs-on: ubuntu-latest
+      outputs:
+        CURRENT: ${{ env.CURRENT_REDIS_VERSION }}
+      steps:
+        - name: Compute outputs
+          run: |
+            echo "CURRENT=${{ env.CURRENT_REDIS_VERSION }}" >> $GITHUB_OUTPUT
+
+    tests:
+      runs-on: ubuntu-latest
+      timeout-minutes: 60
+      needs: redis_version
+      strategy:
+        max-parallel: 15
+        fail-fast: false
+        matrix:
+          redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}', '7.2.6', '6.2.16']
+          dotnet-version: ['6.0', '7.0', '8.0']
+      env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+      name: Redis ${{ matrix.redis-version }}; .NET ${{ matrix.dotnet-version }};
+      steps:
+        - uses: actions/checkout@v4
+        - name: Run tests
+          uses: ./.github/actions/run-tests
+          with:
+              dotnet-version: ${{ matrix.dotnet-version }}              
+              redis-version: ${{ matrix.redis-version }}
+              REDIS_CA_PEM: ${{ secrets.REDIS_CA_PEM }}
+              REDIS_USER_CRT: ${{ secrets.REDIS_USER_CRT }}
+              REDIS_USER_PRIVATE_KEY: ${{ secrets.REDIS_USER_PRIVATE_KEY }}
 
   build_and_test_windows:
     name: Windows Test ${{matrix.redis-stack-version}}