Keep working on merge workflow

bcgov · Sep 23, 2023 · 9665ce8 · 9665ce8
1 parent 62aeb18
commit 9665ce8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -1,6 +1,7 @@
 name: Merge
 
 on:
+  pull_request:
   workflow_run:
     workflows: [PR Closed]
     types: [completed]
@@ -56,7 +57,6 @@ jobs:
           oc_server: ${{ vars.OC_SERVER }}
           oc_token: ${{ secrets.OC_TOKEN }}
           overwrite: ${{ matrix.overwrite }}
-          penetration_test: false
           parameters:
             -p ZONE=test -p NAME=${{ github.event.repository.name }}
             -p PROMOTE=${{ github.repository }}/${{ matrix.name }}:test
@@ -167,7 +167,6 @@ jobs:
           oc_server: ${{ vars.OC_SERVER }}
           oc_token: ${{ secrets.OC_TOKEN }}
           overwrite: ${{ matrix.overwrite }}
-          penetration_test: false
           parameters:
             -p ZONE=prod -p NAME=${{ github.event.repository.name }}
             -p PROMOTE=${{ github.repository }}/${{ matrix.name }}:prod

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -132,7 +132,6 @@ jobs:
           oc_server: ${{ vars.OC_SERVER }}
           oc_token: ${{ secrets.OC_TOKEN }}
           overwrite: ${{ matrix.overwrite }}
-          penetration_test: false
           parameters:
             -p ZONE=${{ github.event.number }} -p NAME=${{ github.event.repository.name }}
             -p PROMOTE=${{ github.repository }}/${{ matrix.name }}:${{ github.event.number }}