DONT MERGE: fixup! infra: prompt for manual trigger in case external …

…contributors can't run Web UI tests
KKoukiou · Dec 5, 2024 · e514206 · e514206
1 parent 66eebb6
commit e514206
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/trigger-webui.yml b/.github/workflows/trigger-webui.yml
@@ -51,6 +51,7 @@ jobs:
       # than the COPR srpm build finishes.
       - name: Wait for packit COPR build
         run: |
+          exit 0
           set -ex
           PUSH_TIME=$(date --utc +%Y%m%d%H%M%S -d '${{ github.event.pull_request.head.repo.pushed_at }}')
           COPR_NAME="${{ github.event.pull_request.base.user.login }}-${{ github.event.pull_request.base.repo.name }}-${{ github.event.number }}"
@@ -73,7 +74,7 @@ jobs:
           mkdir -p ~/.config/cockpit-dev
           echo '${{ secrets.GITHUB_TOKEN }}' > ~/.config/cockpit-dev/github-token
           cmd_output=$(bots/tests-trigger --repo ${{ github.repository }} ${{ github.event.number }} fedora-rawhide-boot/anaconda-pr-${{ github.event.number }}@rhinstaller/anaconda-webui 2>&1)
-          if echo "$cmd_output" | grep -q 'Override with --allow'; then
+          if echo "$cmd_output" | grep -qv 'Override with --allow'; then
               sha="${{ needs.pr-info.outputs.sha }}"
               url="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}#artifacts"
 

diff --git a/.github/workflows/trigger-webui.yml.j2 b/.github/workflows/trigger-webui.yml.j2
@@ -45,6 +45,7 @@ jobs:
       # than the COPR srpm build finishes.
       - name: Wait for packit COPR build
         run: |
+          exit 0
           set -ex
           PUSH_TIME=$(date --utc +%Y%m%d%H%M%S -d '${{ github.event.pull_request.head.repo.pushed_at }}')
           COPR_NAME="${{ github.event.pull_request.base.user.login }}-${{ github.event.pull_request.base.repo.name }}-${{ github.event.number }}"
@@ -67,7 +68,7 @@ jobs:
           mkdir -p ~/.config/cockpit-dev
           echo '${{ secrets.GITHUB_TOKEN }}' > ~/.config/cockpit-dev/github-token
           cmd_output=$(bots/tests-trigger --repo ${{ github.repository }} ${{ github.event.number }} fedora-rawhide-boot/anaconda-pr-${{ github.event.number }}@rhinstaller/anaconda-webui 2>&1)
-          if echo "$cmd_output" | grep -q 'Override with --allow'; then
+          if echo "$cmd_output" | grep -qv 'Override with --allow'; then
               sha="${{ needs.pr-info.outputs.sha }}"
               url="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}#artifacts"