tmp

Author: lgfa29

.github/workflows/acceptance-sim.yml

@@ -6,6 +6,10 @@ on:
       omicron-sha:
         type: "string"
         required: true
+      testrail-upload:
+        type: "boolean"
+        require: false
+        default: false
     secrets:
       testrail-host:
         required: false
@@ -129,24 +133,24 @@ jobs:
           if [ -f ./acc-test-rerun.txt ]; then
             echo "::warning title=${{ github.job }} (${{ matrix.tf-binary }}) - test rerun::$(cat ./acc-test-rerun.txt)"
           fi
-      #- name: upload test results to TestRail
-      #  if: always()
-      #  continue-on-error: true
-      #  env:
-      #    TR_CLI_HOST: ${{ secrets.testrail-host }}
-      #    TR_CLI_USERNAME: ${{ secrets.testrail-username }}
-      #    TR_CLI_KEY: ${{ secrets.testrail-api-key }}
-      #    TR_CLI_PROJECT: ${{ secrets.testrail-project }}
-      #  run: |
-      #    uvx trcli \
-      #      --yes `# Auto-create new test cases.` \
-      #      parse_junit \
-      #        --file './acctest/acc-tests.xml' \
-      #        --title 'Acceptance Tests (${{ matrix.tf-binary }}) - ${{ github.run_id }} - ${{ job.check_run_id }}' \
-      #        --run-description 'GitHub workflow: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/job/${{ job.check_run_id }}' \
-      #        --update-existing-cases 'yes' \
-      #        --case-matcher 'auto' \
-      #        --close-run
+      - name: upload test results to TestRail
+        if: ${{ always() && secrets.testrail-host != '' }}
+        continue-on-error: true
+        env:
+          TR_CLI_HOST: ${{ secrets.testrail-host }}
+          TR_CLI_USERNAME: ${{ secrets.testrail-username }}
+          TR_CLI_KEY: ${{ secrets.testrail-api-key }}
+          TR_CLI_PROJECT: ${{ secrets.testrail-project }}
+        run: |
+          uvx trcli \
+            --yes `# Auto-create new test cases.` \
+            parse_junit \
+              --file './acctest/acc-tests.xml' \
+              --title 'Acceptance Tests (${{ matrix.tf-binary }}) - ${{ github.run_id }} - ${{ job.check_run_id }}' \
+              --run-description 'GitHub workflow: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/job/${{ job.check_run_id }}' \
+              --update-existing-cases 'yes' \
+              --case-matcher 'auto' \
+              --close-run
       - name: upload logs
         if: always()
         continue-on-error: true

.github/workflows/build-test.yml

@@ -1,10 +1,10 @@
 name: build & test
 on:
   push:
-    branches:
-      - main
-      - '[0-9].[0-9]+'
-      - 'rel/v*'
+    #branches:
+    #  - main
+    #  - '[0-9].[0-9]+'
+    #  - 'rel/v*'
   pull_request:
   schedule:
     # Cron jobs test against omicron main to catch breaking changes early.
@@ -65,7 +65,7 @@ jobs:
         if: matrix.tf-binary == 'terraform' # Linting tools require Terraform to be installed.
         run: make lint
       - name: upload test results to TestRail
-        if: always()
+        if: ${{ always() && github.event_name == 'workflow_dispatch' }}
         continue-on-error: true
         env:
           TR_CLI_HOST: ${{ secrets.TESTRAIL_HOST }}
@@ -171,6 +171,7 @@ jobs:
     with:
       omicron-sha: ${{ needs.omicron-version.outputs.sha }}
     secrets:
+      testrail-upload: ${{ github.event_name == 'workflow_dispatch' }}
       testrail-host: ${{ secrets.TESTRAIL_HOST }}
       testrail-username: ${{ secrets.TESTRAIL_USERNAME }}
       testrail-api-key: ${{ secrets.TESTRAIL_API_KEY }}