From 30a06a60917bfaa2759e6cbd2c475fcf0f574691 Mon Sep 17 00:00:00 2001 From: Mickael Bourgois Date: Wed, 1 Jul 2026 19:29:52 +0200 Subject: [PATCH 1/2] CLDSRV-942: Fix missing s3 logs artifact for S3C The production image uses yarn start and output logs to docker instead of file The testcoverage image redirects the stdout/stderr output to files --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 9cce05736c..ae8ed0c6eb 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -513,7 +513,7 @@ jobs: S3DATA: scality S3METADATA: scality S3VAULT: scality - CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }} + CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}-testcoverage MPU_TESTING: "yes" DEFAULT_BUCKET_KEY_FORMAT: ${{ matrix.vformat }} ENABLE_NULL_VERSION_COMPAT_MODE: ${{ matrix.enable-null-compat }} From fec79cf8574c0fe0119551e8ebb910e2e3410aa1 Mon Sep 17 00:00:00 2001 From: Mickael Bourgois Date: Wed, 1 Jul 2026 19:31:25 +0200 Subject: [PATCH 2/2] CLDSRV-942: Fix missing coverage for matrix job S3C and file ft tests had a different job name path on disk than github.job for codecov coverage. --- .github/actions/cleanup-and-coverage/action.yaml | 6 +++++- .github/workflows/tests.yaml | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/actions/cleanup-and-coverage/action.yaml b/.github/actions/cleanup-and-coverage/action.yaml index 8af4310092..f783b9518d 100644 --- a/.github/actions/cleanup-and-coverage/action.yaml +++ b/.github/actions/cleanup-and-coverage/action.yaml @@ -9,6 +9,10 @@ inputs: codecov-token: description: 'Codecov token for uploading reports' required: true + job-name: + description: 'Used to locate coverage dir (/tmp/coverage/); pass matrix.job-name for matrix jobs.' + required: false + default: '${{ github.job }}' flags: description: 'Flags to identify the coverage report' required: false @@ -35,6 +39,6 @@ runs: uses: codecov/codecov-action@v5 with: token: ${{ inputs.codecov-token }} - directory: /tmp/coverage/${{ github.job }} + directory: /tmp/coverage/${{ inputs.job-name }} flags: ${{ inputs.flags }} if: ${{ !cancelled() }} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index ae8ed0c6eb..7b6a49052c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -472,6 +472,7 @@ jobs: uses: ./.github/actions/cleanup-and-coverage with: codecov-token: ${{ secrets.CODECOV_TOKEN }} + job-name: ${{ matrix.job-name }} flags: ${{ matrix.job-name }} if: always() - name: Upload test results to Codecov @@ -602,6 +603,7 @@ jobs: uses: ./.github/actions/cleanup-and-coverage with: codecov-token: ${{ secrets.CODECOV_TOKEN }} + job-name: ${{ matrix.job-name }} flags: ${{ matrix.job-name }} if: always() - name: Upload test results to Codecov