From 8e756f6c0f8c5791119d476161ccf8fb0390af85 Mon Sep 17 00:00:00 2001 From: Salah Al Saleh Date: Wed, 23 Oct 2024 08:51:17 -0700 Subject: [PATCH] Fix automated PRs manager detecting E2E CI jobs (#1374) * Fix automated PRs manager detecting E2E CI jobs --- .github/workflows/automated-prs-manager.yaml | 4 ++-- .github/workflows/ci.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/automated-prs-manager.yaml b/.github/workflows/automated-prs-manager.yaml index a83a756c9..27c1b8e84 100644 --- a/.github/workflows/automated-prs-manager.yaml +++ b/.github/workflows/automated-prs-manager.yaml @@ -90,8 +90,8 @@ jobs: # If more than half of the e2e jobs are successful, re-run the failed jobs. - num_of_jobs=$(gh run view "$run_id" --json jobs -q '.jobs[] | select(.name | startswith("e2e")) | .name' | wc -l) - num_of_successful_jobs=$(gh run view "$run_id" --json jobs -q '.jobs[] | select((.name | startswith("e2e")) and (.conclusion == "success")) | .name' | wc -l) + num_of_jobs=$(gh run view "$run_id" --json jobs -q '.jobs[] | select(.name | startswith("E2E")) | .name' | wc -l) + num_of_successful_jobs=$(gh run view "$run_id" --json jobs -q '.jobs[] | select((.name | startswith("E2E")) and (.conclusion == "success")) | .name' | wc -l) if [ "$num_of_successful_jobs" -gt $((num_of_jobs / 2)) ]; then echo "More than half of the e2e jobs are successful. Re-running failed jobs." diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 54f1bacf2..099d06167 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -481,7 +481,7 @@ jobs: # e2e-docker runs the e2e tests inside a docker container rather than a full VM e2e-docker: - name: E2E docker + name: E2E docker # this name is used by .github/workflows/automated-prs-manager.yaml runs-on: ubuntu-latest needs: - git-sha @@ -570,7 +570,7 @@ jobs: test-name: '${{ matrix.test }}' e2e: - name: E2E + name: E2E # this name is used by .github/workflows/automated-prs-manager.yaml runs-on: ${{ matrix.runner || 'ubuntu-22.04' }} needs: - build-current