Merge pull request #184 from scality/improvement/COSI-89-test-both-9.4-and-9.5

CSI-89: Updated E2E tests to use S3 for both 9.4 and 9.5

Author: anurag4DSB

.github/s3_and_iam_deployment/.env

@@ -1,2 +1 @@
 VAULT_IMAGE="ghcr.io/scality/vault:7.70.26"
-CLOUDSERVER_IMAGE="ghcr.io/scality/cloudserver:7.70.55"

.github/workflows/helm-validation.yml

@@ -19,7 +19,19 @@ on:
 
 jobs:
   e2e-tests-with-helm:
+    name: E2E tests with RING v${{ matrix.ring_version }}
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - ring_version: "9.4"
+            github_variable_name: "CLOUDSERVER_RING_9_4"
+          - ring_version: "9.5"
+            github_variable_name: "CLOUDSERVER_RING_9_5"
+
+    env:
+      CLOUDSERVER_IMAGE: ${{ vars[matrix.github_variable_name] }}
 
     steps:
     - name: Check out repository
@@ -37,8 +49,9 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /tmp/.docker_cache
-        key: docker-${{ runner.os }}-${{ hashFiles('.github/s3_and_iam_deployment/.env') }}
+        key: docker-${{ runner.os }}-${{ matrix.ring_version }}-${{ env.CLOUDSERVER_IMAGE }}
         restore-keys: |
+          docker-${{ runner.os }}-${{ matrix.ring_version }}-
           docker-${{ runner.os }}-
 
     - name: Set up Helm
@@ -100,6 +113,9 @@ jobs:
         mkdir -p logs/s3 logs/iam logs/cosi_driver data/vaultdb
         chown -R runner:docker logs data
         chmod -R ugo+rwx logs data
+
+        # Override CLOUDSERVER_IMAGE in docker-compose
+        export CLOUDSERVER_IMAGE="${{ env.CLOUDSERVER_IMAGE }}"
         docker compose --profile iam_s3 up -d --quiet-pull
         bash ../scripts/wait_for_local_port.bash 8600 30
         bash ../scripts/wait_for_local_port.bash 8000 30
@@ -110,10 +126,10 @@ jobs:
       run: |
         source .github/s3_and_iam_deployment/.env
         echo "Vault Image: $VAULT_IMAGE"
-        echo "CloudServer Image: $CLOUDSERVER_IMAGE"
+        echo "CloudServer Image: ${{ env.CLOUDSERVER_IMAGE }}"
         mkdir -p /tmp/.docker_cache
         docker save "$VAULT_IMAGE" -o /tmp/.docker_cache/vault_image.tar
-        docker save "$CLOUDSERVER_IMAGE" -o /tmp/.docker_cache/cloudserver_image.tar
+        docker save "${{ env.CLOUDSERVER_IMAGE }}" -o /tmp/.docker_cache/cloudserver_image.tar
       shell: bash
 
     - name: Install Scality COSI Driver using Helm Chart
@@ -191,3 +207,4 @@ jobs:
         user: ${{ secrets.ARTIFACTS_USER }}
         password: ${{ secrets.ARTIFACTS_PASSWORD }}
         source: .github/e2e_tests/artifacts
+        name: e2e-tests-helm-${{ matrix.ring_version }}

.github/workflows/kustomize-validation.yml

@@ -19,7 +19,19 @@ on:
 
 jobs:
   e2e-tests-with-kustomize:
+    name: E2E testswith RING v${{ matrix.ring_version }}
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - ring_version: "9.4"
+            github_variable_name: "CLOUDSERVER_RING_9_4"
+          - ring_version: "9.5"
+            github_variable_name: "CLOUDSERVER_RING_9_5"
+
+    env:
+      CLOUDSERVER_IMAGE: ${{ vars[matrix.github_variable_name] }}
 
     steps:
     - name: Check out repository
@@ -37,10 +49,11 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /tmp/.docker_cache
-        key: docker-${{ runner.os }}-${{ hashFiles('.github/s3_and_iam_deployment/.env') }}
+        key: docker-${{ runner.os }}-${{ matrix.ring_version }}-${{ env.CLOUDSERVER_IMAGE }}
         restore-keys: |
+          docker-${{ runner.os }}-${{ matrix.ring_version }}-
           docker-${{ runner.os }}-
-    
+
     - name: Create k8s KIND Cluster
       uses: helm/[email protected]
       with:
@@ -92,6 +105,9 @@ jobs:
         mkdir -p logs/s3 logs/iam logs/cosi_driver data/vaultdb
         chown -R runner:docker logs data
         chmod -R ugo+rwx logs data
+        
+        # Override CLOUDSERVER_IMAGE in docker-compose
+        export CLOUDSERVER_IMAGE="${{ env.CLOUDSERVER_IMAGE }}"
         docker compose --profile iam_s3 up -d --quiet-pull
         bash ../scripts/wait_for_local_port.bash 8600 30
         bash ../scripts/wait_for_local_port.bash 8000 30
@@ -102,10 +118,10 @@ jobs:
       run: |
         source .github/s3_and_iam_deployment/.env
         echo "Vault Image: $VAULT_IMAGE"
-        echo "CloudServer Image: $CLOUDSERVER_IMAGE"
+        echo "CloudServer Image: ${{ env.CLOUDSERVER_IMAGE }}"
         mkdir -p /tmp/.docker_cache
         docker save "$VAULT_IMAGE" -o /tmp/.docker_cache/vault_image.tar
-        docker save "$CLOUDSERVER_IMAGE" -o /tmp/.docker_cache/cloudserver_image.tar
+        docker save "${{ env.CLOUDSERVER_IMAGE }}" -o /tmp/.docker_cache/cloudserver_image.tar
       shell: bash
 
     - name: E2E tests for greenfield use case using kustomize
@@ -165,3 +181,4 @@ jobs:
         user: ${{ secrets.ARTIFACTS_USER }}
         password: ${{ secrets.ARTIFACTS_PASSWORD }}
         source: .github/e2e_tests/artifacts
+        name: e2e-tests-${{ matrix.ring_version }}