From cb9e0ce5526fe59f07758ecbca4252c7a56a89c4 Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya <ben@byk.im>
Date: Fri, 3 Jan 2025 00:36:33 +0300
Subject: [PATCH] ci: Only test on compose 2.26 w/ customizations (#3506)

Docker Compose is much more robust nowadays compared to the past where we had to maintain tests for both v1 and v2 and then a specific version of v2. Hence, we are removing tests for the older versions of Docker Compose with this patch. We also remove the separate tests for customizations and w/o customizations as the one with customizations should cover the one without them anyway. This reduces the CI workload to 25% of what it was
---
 .github/workflows/test.yml | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 79f8dc5a2a..cbea11a931 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -141,19 +141,8 @@ jobs:
   integration-test:
     if: github.repository_owner == 'getsentry'
     runs-on: ubuntu-22.04
-    name: integration test ${{ matrix.compose_version }} - customizations ${{ matrix.customizations }}
-    strategy:
-      fail-fast: false
-      matrix:
-        customizations: ["disabled", "enabled"]
-        compose_version: ["v2.19.0", "v2.26.0"]
-        include:
-          - compose_version: "v2.19.0"
-            compose_path: "/usr/local/lib/docker/cli-plugins"
-          - compose_version: "v2.26.0"
-            compose_path: "/usr/local/lib/docker/cli-plugins"
+    name: integration test
     env:
-      COMPOSE_PROJECT_NAME: self-hosted-${{ strategy.job-index }}
       REPORT_SELF_HOSTED_ISSUES: 0
       SELF_HOSTED_TESTING_DSN: ${{ vars.SELF_HOSTED_TESTING_DSN }}
     steps:
@@ -177,16 +166,19 @@ jobs:
           fi
 
       - name: Get Compose
+        env:
+          COMPOSE_PATH: /usr/local/lib/docker/cli-plugins
+          COMPOSE_VERSION: 'v2.26.0'
         run: |
           # Always remove `docker compose` support as that's the newer version
           # and comes installed by default nowadays.
           sudo rm -f "/usr/local/lib/docker/cli-plugins/docker-compose"
           # Docker Compose v1 is installed here, remove it
           sudo rm -f "/usr/local/bin/docker-compose"
-          sudo rm -f "${{ matrix.compose_path }}/docker-compose"
-          sudo mkdir -p "${{ matrix.compose_path }}"
-          sudo curl -L https://github.com/docker/compose/releases/download/${{ matrix.compose_version }}/docker-compose-`uname -s`-`uname -m` -o "${{ matrix.compose_path }}/docker-compose"
-          sudo chmod +x "${{ matrix.compose_path }}/docker-compose"
+          sudo rm -f "${{ env.COMPOSE_PATH }}/docker-compose"
+          sudo mkdir -p "${{ env.COMPOSE_PATH }}"
+          sudo curl -L https://github.com/docker/compose/releases/download/${{ env.COMPOSE_VERSION }}/docker-compose-`uname -s`-`uname -m` -o "${{ env.COMPOSE_PATH }}/docker-compose"
+          sudo chmod +x "${{ env.COMPOSE_PATH }}/docker-compose"
 
       - name: Prepare Docker Volume Caching
         id: cache_key
@@ -243,11 +235,7 @@ jobs:
       - name: Integration Test
         run: |
           docker compose up --wait
-          if [ "${{ matrix.compose_version }}" = "v2.19.0" ]; then
-            pytest --reruns 3 --cov --junitxml=junit.xml _integration-test/ --customizations=${{ matrix.customizations }}
-          else
-            pytest --cov --junitxml=junit.xml _integration-test/ --customizations=${{ matrix.customizations }}
-          fi
+          pytest --cov --junitxml=junit.xml _integration-test/ --customizations=enabled
 
       - name: Inspect failure
         if: failure()