From ce12a17e916921c536238cec796baf51727093df Mon Sep 17 00:00:00 2001
From: Vadym Yarosh <vadym.yarosh@percona.com>
Date: Thu, 6 Jul 2023 12:57:27 +0200
Subject: [PATCH] PMM-7 fixed empty sha error

---
 .github/workflows/pmm-ui-tests.yml           | 15 ++++++++++-----
 .github/workflows/upgrade-tests-pipeline.yml |  6 +++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pmm-ui-tests.yml b/.github/workflows/pmm-ui-tests.yml
index 5194709c8..568a6e4da 100644
--- a/.github/workflows/pmm-ui-tests.yml
+++ b/.github/workflows/pmm-ui-tests.yml
@@ -104,7 +104,7 @@ jobs:
 
     steps:
       - name: PMM server version ${{ inputs.pmm_server_version }} and UI tests for flag "${{ inputs.pmm_test_flag }}" and pmm-ui-tests branch ${{ inputs.pmm_ui_tests_branch }}
-        if: ${{ github.event_name == 'workflow_dispatch' && env.SHA != 'null' }}
+        if: ${{ env.SHA != 'null' }}
         uses: percona/gh-action-Sibz-github-status-action@v1
         continue-on-error: true
         with:
@@ -144,10 +144,15 @@ jobs:
           sudo npx ts-node ./integration-setup.ts --ci --setup-docker-pmm-server --rbac --pmm-server-docker-tag=${{ env.PMM_SERVER_VERSION }} --pmm-client-version=${{ env.PMM_CLIENT_VERSION }}
           timeout 100 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost/ping)" != "200" ]]; do sleep 5; done' || false
 
-      - name: 'Setup <PMM Client: ${{ inputs.pmm_client_version }}> and Services'
+      - name: 'Setup <PMM Client: ${{ inputs.pmm_client_version }}>'
         run: |
           sudo bash ./pmm-qa/pmm-tests/pmm2-client-setup.sh --pmm_server_ip 127.0.0.1 --client_version ${{ env.PMM_CLIENT_VERSION }} --admin_password admin --use_metrics_mode no
-          sudo npx ts-node ./pmm-qa/pmm-integration/integration-setup.ts --ci \
+        shell: bash
+
+      - name: Setup Databases for the PMM-Server
+        working-directory: pmm-qa/pmm-integration
+        run: |
+          sudo npx ts-node ./integration-setup.ts --ci \
           ${{ env.PMM_CLIENTS }}
           sleep 30
           sudo pmm-admin list
@@ -188,8 +193,8 @@ jobs:
           path: ./pmm-ui-tests/playwright-tests/playwright-report
 
       - name: Create status check
-        uses: percona-platform/github-status-action@v1
-        if: ${{ github.event_name != 'pull_request' && always() }}
+        uses: percona/gh-action-Sibz-github-status-action@v1
+        if: ${{ env.SHA != 'null' && always() }}
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/upgrade-tests-pipeline.yml b/.github/workflows/upgrade-tests-pipeline.yml
index c63524a0c..aa3c2c659 100644
--- a/.github/workflows/upgrade-tests-pipeline.yml
+++ b/.github/workflows/upgrade-tests-pipeline.yml
@@ -133,17 +133,17 @@ jobs:
       SERVICENOW_DEV_URL: 'https://perconadev.service-now.com/api/x_pellc_percona_pl/platform/settest'
 
     steps:
-      - name: 'Create job tag'
+      - name: 'Set job tag'
         run: |
           job_tag=$(echo "${{ inputs.pre_upgrade_tests }}" | sed -e "s/-pre-upgrade//" -e "s/@//")
           echo $job_tag
           echo "JOB_TAG=$job_tag" >> $GITHUB_ENV
 
       - name: 'PMM Server(${{ inputs.pmm_server_start_version }}) and UI tests with tags "${{ inputs.pre_upgrade_tests }}, ${{ inputs.post_upgrade_tests }}" from pmm-ui-tests branch: ${{ inputs.pmm_ui_tests_branch }}'
-        if: ${{ github.event_name == 'workflow_dispatch' && env.SHA != 'null' }}
+        if: ${{ env.SHA != 'null' }}
         uses: percona/gh-action-Sibz-github-status-action@v1
         with:
-          context: 'PMM Upgrade Tests: ${{ env.REPORT_NAME }}'
+          context: 'PMM Upgrade Tests ${{ env.REPORT_NAME }}'
           description: "Test execution ${{ job.status }}"
           state: 'pending'
           repository: ${{ inputs.repository }}