Add CI step for integration trigger instructions

mozilla · Jun 21, 2021 · 4682a58 · 4682a58
1 parent be931aa
commit 4682a58
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -366,11 +366,31 @@ jobs:
       - gcp-gcr/push-image:
           image: bigquery-etl
           tag: ${CIRCLE_TAG:-latest}
+  fail-on-fork:
+    docker: *docker
+    steps:
+      - checkout
+      - run:
+          name: Manually trigger integration tests for fork
+          command: |
+            echo "Integration tests for this fork need to be triggered manually"
+            echo "Users with write access to the repository can trigger" \ 
+              " integration tests by visiting: "
+            echo "https://github.com/mozilla/bigquery-etl/actions/workflows" \
+              "/push-to-upstream.yml".
+            echo "Trigger via 'Run workflow' and provide the " \
+              "<username>:<branch>" of this PR as parameters."
+
+            exit 1
 
 workflows:
   version: 2
   build:
     jobs: &build_jobs
+      - fail-on-fork:
+          filters:
+            branches:
+              only: /^pull\/.*$/
       - build:
           context: data-eng-circleci-tests
       - verify-format-sql

diff --git a/.github/workflows/push-to-upstream.yml b/.github/workflows/push-to-upstream.yml
@@ -17,7 +17,7 @@ jobs:
     - name: webfactory/ssh-agent
       uses: webfactory/ssh-agent@v0.5.1
       with:
-          ssh-private-key: ${{ secrets.GH_ACTION_SSH_KEY }}
+        ssh-private-key: ${{ secrets.GH_ACTION_SSH_KEY }}
     - name: push-upstream
       run: |
         ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
@@ -34,4 +34,6 @@ jobs:
         git clone git@github.com:mozilla/bigquery-etl.git
         cd gh-actions-test
 
-        ../bin/git-push-fork-to-upstream-branch git@github.com:mozilla/bigquery-etl.git ${{ github.event.inputs.name }}
+        ../bin/git-push-fork-to-upstream-branch \
+          git@github.com:mozilla/bigquery-etl.git \
+          ${{ github.event.inputs.name }}