Fixes for PENDING_RUN and GITHUB_ORG

spetrosi · Aug 2, 2024 · 19e9dfd · 19e9dfd
1 parent 633fb1f
commit 19e9dfd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/tft.yml b/.github/workflows/tft.yml
@@ -157,7 +157,7 @@ jobs:
           pipeline_settings: '{ "type": "tmt-multihost" }'
           variables: "ANSIBLE_VER=${{ matrix.ansible_version }};\
             REPO_NAME=${{ github.event.repository.name }};\
-            GITHUB_ORG=linux-system-roles;\
+            GITHUB_ORG=${{ github.repository_owner }};\
             PR_NUM=${{ github.event.issue.number }};\
             ARTIFACTS_DIR=${{ steps.set_vars.outputs.ARTIFACTS_DIR }};\
             ARTIFACTS_URL=${{ steps.set_vars.outputs.ARTIFACTS_URL }};\

diff --git a/.github/workflows/tft_citest_bad.yml b/.github/workflows/tft_citest_bad.yml
@@ -26,7 +26,7 @@ jobs:
         run: |
           PENDING_RUN=$(gh api "repos/$REPO/actions/workflows/tft.yml/runs?event=issue_comment" \
             | jq -r '[.workflow_runs[] | select(.display_title="$PR_TITLE") | select(.status == "pending" or .status == "queued" or .status == "in_progress") | .id][0]')
-          if [ "$RUN_ID" = "null" ]; then # if pending run don't exist, take the last run with failure state
+          if [ "$PENDING_RUN" = "null" ]; then # if pending run don't exist, take the last run with failure state
             RUN_ID=$(gh api "repos/$REPO/actions/workflows/tft.yml/runs?event=issue_comment" \
               | jq -r '[.workflow_runs[] | select( .conclusion == "failure" ) | select ( .display_title="$PR_TITLE" ) | .id][0]')
             echo "Re-running workflow $RUN_ID"