Add pull request workflow trigger

Azure · Nov 15, 2024 · 02d942a · 02d942a
1 parent cbe30a4
commit 02d942a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/fuzzing-run.yml b/.github/workflows/fuzzing-run.yml
@@ -12,11 +12,10 @@ on:
       package-type:
         required: true
         type: string
-      timeout-seconds:
-        description: The maximum time in seconds to run the fuzzer.
-        required: false
-        type: number
-        default: 600
+      trigger:
+        description: The event name that triggered this workflow.
+        required: true
+        type: string
       container-tag:
         type: string
         required: false
@@ -25,6 +24,8 @@ on:
 env:
   MOUNT: /azure-osconfig
   REGISTRY: ghcr.io
+  WF_DISPATCH_TIMEOUT: 3600
+  PR_DISPATCH_TIMEOUT: 300
 
 jobs:
   package:
@@ -63,12 +64,21 @@ jobs:
           working-directory: ${{ env.MOUNT }}/tests/fuzzer
           cmd: mkdir -p ${{ env.MOUNT }}/output/artifacts && mkdir /tmp/corpus && cp -r ${{ env.MOUNT }}/src/tests/fuzzer/seed_corpus/* /tmp/corpus && chmod u+x ./osconfig-fuzzer
 
-      - name: Run osconfig-fuzzer
+      - if: ${{ inputs.trigger == 'workflow_dispatch' }}
+        name: Run osconfig-fuzzer
+        uses: ./.github/actions/container-exec
+        with:
+          container: ${{ steps.container.outputs.id }}
+          working-directory: ${{ env.MOUNT }}/tests/fuzzer
+          cmd: set -o pipefail && ./osconfig-fuzzer -artifact_prefix=${{ env.MOUNT }}/output/artifacts/ -max_total_time=${{ env.WF_DISPATCH_TIMEOUT }} /tmp/corpus 2>&1 >/dev/null | tee ${{ env.MOUNT }}/output/osconfig-fuzzer.log
+
+      - if: ${{ inputs.trigger == 'pull_request' }}
+        name: Run osconfig-fuzzer
         uses: ./.github/actions/container-exec
         with:
           container: ${{ steps.container.outputs.id }}
           working-directory: ${{ env.MOUNT }}/tests/fuzzer
-          cmd: set -o pipefail && ./osconfig-fuzzer -artifact_prefix=${{ env.MOUNT }}/output/artifacts/ -max_total_time=${{ inputs.timeout-seconds }} /tmp/corpus 2>&1 >/dev/null | tee ${{ env.MOUNT }}/output/osconfig-fuzzer.log
+          cmd: set -o pipefail && ./osconfig-fuzzer -artifact_prefix=${{ env.MOUNT }}/output/artifacts/ -max_total_time=${{ env.PR_DISPATCH_TIMEOUT }} /tmp/corpus 2>&1 >/dev/null | tee ${{ env.MOUNT }}/output/osconfig-fuzzer.log
 
       - uses: actions/upload-artifact@v4
         if: success() || failure()

diff --git a/.github/workflows/fuzzing.yml b/.github/workflows/fuzzing.yml
@@ -2,6 +2,7 @@ name: Fuzzer execution
 
 on:
   workflow_dispatch:
+  pull_request:
 
 jobs:
   fuzzer-execution:
@@ -19,4 +20,4 @@ jobs:
       target: ${{ matrix.target.os }}-${{ matrix.target.version }}
       arch: ${{ matrix.arch }}
       package-type: ${{ matrix.target.package-type }}
-      timeout-seconds: 3600
+      trigger: ${{ github.event_name }}