fixup! add coverage to functional tests

Author: Kerkesni

.github/actions/cleanup-and-coverage/action.yaml

@@ -0,0 +1,35 @@
+name: 'Cleanup and Coverage'
+description: 'Stops CI services and uploads coverage reports to Codecov'
+
+inputs:
+  profiles:
+    description: 'Docker Compose profiles to use (space-separated)'
+    required: false
+    default: ''
+  codecov-token:
+    description: 'Codecov token for uploading reports'
+    required: true
+  flags:
+    description: 'Flags to identify the coverage report'
+    required: false
+    default: '${{ github.job }}'
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Stop CI services
+      run: |
+        PROFILES=""
+        for profile in ${{ inputs.profiles }}; do
+          PROFILES="${PROFILES} --profile ${profile}"
+        done
+        docker compose ${PROFILES} down
+      working-directory: .github/docker
+    
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v5
+      with:
+        token: ${{ inputs.codecov-token }}
+        directory: /tmp/coverage/${{ github.job }}
+        flags: ${{ inputs.flags }}
+      if: ${{ !cancelled() }}

.github/workflows/tests.yaml

@@ -253,17 +253,12 @@ jobs:
         yarn run multiple_backend_test | tee /tmp/artifacts/${{ github.job }}/tests.log
       env:
         S3_LOCATION_FILE: tests/locationConfig/locationConfigTests.json
-    # Stopping the services to generate coverage reports
-    - name: Stop CI services
-      run: docker compose --profile sproxyd --profile mongo down
-      working-directory: .github/docker
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v5
+    - name: Cleanup and upload coverage
+      uses: ./.github/actions/cleanup-and-coverage
       with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        directory: /tmp/coverage/${{ github.job }}
-        flags: ${{ github.job }}
-      if: ${{ !cancelled() }}
+        profiles: 'sproxyd mongo'
+        codecov-token: ${{ secrets.CODECOV_TOKEN }}
+      if: always()
     - name: Upload logs to artifacts
       uses: scality/action-artifacts@v4
       with:
@@ -302,17 +297,12 @@ jobs:
         yarn run ft_test | tee /tmp/artifacts/${{ github.job }}/tests.log
       env:
         S3_LOCATION_FILE: tests/locationConfig/locationConfigTests.json
-    # Stopping the services to generate coverage reports
-    - name: Stop CI services
-      run: docker compose --profile mongo down
-      working-directory: .github/docker
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v5
+    - name: Cleanup and upload coverage
+      uses: ./.github/actions/cleanup-and-coverage
       with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        directory: /tmp/coverage/${{ github.job }}
-        flags: ${{ github.job }}
-      if: ${{ !cancelled() }}
+        profiles: 'mongo'
+        codecov-token: ${{ secrets.CODECOV_TOKEN }}
+      if: always()
     - name: Upload logs to artifacts
       uses: scality/action-artifacts@v4
       with:
@@ -353,17 +343,12 @@ jobs:
         yarn run ft_mixed_bucket_format_version | tee /tmp/artifacts/${{ github.job }}/mixed-tests.log
       env:
         S3_LOCATION_FILE: tests/locationConfig/locationConfigTests.json
-    # Stopping the services to generate coverage reports
-    - name: Stop CI services
-      run: docker compose --profile mongo down
-      working-directory: .github/docker
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v5
+    - name: Cleanup and upload coverage
+      uses: ./.github/actions/cleanup-and-coverage
       with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        directory: /tmp/coverage/${{ github.job }}
-        flags: ${{ github.job }}
-      if: ${{ !cancelled() }}
+        profiles: 'mongo'
+        codecov-token: ${{ secrets.CODECOV_TOKEN }}
+      if: always()
     - name: Upload logs to artifacts
       uses: scality/action-artifacts@v4
       with:
@@ -407,17 +392,12 @@ jobs:
         set -o pipefail;
         bash wait_for_local_port.bash 8000 40
         yarn run ft_test | tee /tmp/artifacts/${{ matrix.job-name }}/tests.log
-    # Stopping the services to generate coverage reports
-    - name: Stop CI services
-      run: docker compose down
-      working-directory: .github/docker
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v5
+    - name: Cleanup and upload coverage
+      uses: ./.github/actions/cleanup-and-coverage
       with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        directory: /tmp/coverage/${{ github.job }}
+        codecov-token: ${{ secrets.CODECOV_TOKEN }}
         flags: ${{ matrix.job-name }}
-      if: ${{ !cancelled() }}
+      if: always()
     - name: Upload logs to artifacts
       uses: scality/action-artifacts@v4
       with:
@@ -452,17 +432,11 @@ jobs:
         set -ex -o pipefail;
         bash wait_for_local_port.bash 8000 40
         yarn run test_utapi_v2 | tee /tmp/artifacts/${{ github.job }}/tests.log
-    # Stopping the services to generate coverage reports
-    - name: Stop CI services
-      run: docker compose down
-      working-directory: .github/docker
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v5
+    - name: Cleanup and upload coverage
+      uses: ./.github/actions/cleanup-and-coverage
       with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        directory: /tmp/coverage/${{ github.job }}
-        flags: ${{ github.job }}
-      if: ${{ !cancelled() }}
+        codecov-token: ${{ secrets.CODECOV_TOKEN }}
+      if: always()
     - name: Upload logs to artifacts
       uses: scality/action-artifacts@v4
       with:
@@ -507,17 +481,13 @@ jobs:
         set -ex -o pipefail;
         bash wait_for_local_port.bash 8000 40
         yarn run test_quota | tee /tmp/artifacts/${{ github.job }}/tests.log
-    # Stopping the services to generate coverage reports
-    - name: Stop CI services
-      run: docker compose --profile mongo down
-      working-directory: .github/docker
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v5
+    - name: Cleanup and upload coverage
+      uses: ./.github/actions/cleanup-and-coverage
       with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        directory: /tmp/coverage/${{ github.job }}
+        profiles: 'mongo'
+        codecov-token: ${{ secrets.CODECOV_TOKEN }}
         flags: ${{ github.job }}${{ matrix.inflights.value == 'true' && '-inflights' || '' }}
-      if: ${{ !cancelled() }}
+      if: always()
     - name: Upload logs to artifacts
       uses: scality/action-artifacts@v4
       with:
@@ -556,17 +526,12 @@ jobs:
         bash wait_for_local_port.bash 8000 40
         bash wait_for_local_port.bash 5696 40
         yarn run ft_kmip | tee /tmp/artifacts/${{ github.job }}/tests.log
-    # Stopping the services to generate coverage reports
-    - name: Stop CI services
-      run: docker compose --profile pykmip down
-      working-directory: .github/docker
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v5
+    - name: Cleanup and upload coverage
+      uses: ./.github/actions/cleanup-and-coverage
       with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        directory: /tmp/coverage/${{ github.job }}
-        flags: ${{ github.job }}
-      if: ${{ !cancelled() }}
+        profiles: 'pykmip'
+        codecov-token: ${{ secrets.CODECOV_TOKEN }}
+      if: always()
     - name: Upload logs to artifacts
       uses: scality/action-artifacts@v4
       with:
@@ -645,17 +610,12 @@ jobs:
         S3BACKEND: file
         S3VAULT: mem
         S3METADATA: mongodb
-    # Stopping the services to generate coverage reports
-    - name: Stop CI services
-      run: docker compose --profile ceph down
-      working-directory: .github/docker
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v5
+    - name: Cleanup and upload coverage
+      uses: ./.github/actions/cleanup-and-coverage
       with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        directory: /tmp/coverage/${{ github.job }}
-        flags: ${{ github.job }}
-      if: ${{ !cancelled() }}
+        profiles: 'ceph'
+        codecov-token: ${{ secrets.CODECOV_TOKEN }}
+      if: always()
     - name: Upload logs to artifacts
       uses: scality/action-artifacts@v4
       with: