diff --git a/.github/workflows/sanity-test.yaml b/.github/workflows/sanity-test.yaml index 04edb71..99059f4 100644 --- a/.github/workflows/sanity-test.yaml +++ b/.github/workflows/sanity-test.yaml @@ -13,35 +13,22 @@ concurrency: jobs: sanity-tests: if: (github.event_name == 'pull_request' && github.event.action == 'ready_for_review') || - (github.event_name == 'pull_request_review' && github.event.review.state == 'approved') + (github.event_name == 'pull_request_review' && github.event.review.state == 'approved') || + (github.event_name == 'push' && github.ref == 'refs/heads/main') runs-on: tools-runner steps: - - name: Check for skip sanity test label - id: check-skip-sanity-test - env: - GH_TOKEN: ${{ github.token }} - run: | - gh api -H "Accept: application/vnd.github+json" /repos/sysdiglabs/terraform-google-secure/issues/${{ github.event.pull_request.number }}/labels | jq '[.[].name]' > /tmp/label_list - if grep -q 'skip-sanity-test' /tmp/label_list; then - echo "Skipping terraform-google-secure-onboarding-tests job as skip-sanity-test label is present" - echo "SKIP_SANITY_TEST=true" >> $GITHUB_OUTPUT - else - echo "SKIP_SANITY_TEST=false" >> $GITHUB_OUTPUT - fi - - name: Trigger Onboarding job for this repo - if: ${{ steps.check-skip-sanity-test.outputs.SKIP_SANITY_TEST == 'false'}} id: trigger-jenkins-job uses: sysdiglabs/jenkins-job-trigger-action@1.1.0 with: jenkins_external_base_url: ${{ secrets.JENKINS_EXTERNAL_BASE_URL }} jenkins_url: ${{ secrets.JENKINS_INTERNAL_URL }} - jenkins_user: ${{ secrets.JENKINS_QA_API_USER }} - jenkins_token: ${{ secrets.JENKINS_QA_API_TOKEN }} - job_name: "qa/QA-secure/onboarding/terraform-google-secure-onboarding-tests/" + jenkins_user: ${{ secrets.JENKINS_BOT_API_USER}} + jenkins_token: ${{ secrets.JENKINS_BOT_API_TOKEN}} + job_name: "qa/job/QA-secure/job/onboarding/job/terraform-google-secure-onboarding-tests/" job_params: | { - "MODULE_BRANCH": "${{ github.head_ref }}" + "MODULE_BRANCH": "${{ github.head_ref || github.ref_name }}" } job_timeout: "5400"