diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 0c6a49d4..e52076b5 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -63,7 +63,7 @@ jobs: file: common/openshift.fluentbit.yml overwrite: true steps: - - uses: bcgov-nr/action-deployer-openshift@v2.1.0 + - uses: bcgov-nr/action-deployer-openshift@v2.3.0 with: file: ${{ matrix.file }} oc_namespace: ${{ vars.OC_NAMESPACE }} @@ -73,7 +73,7 @@ jobs: parameters: -p ZONE=test ${{ matrix.parameters }} - timeout: ${{ matrix.timeout }} + timeout: ${{ matrix.timeout || '10m' }} verification_path: ${{ matrix.verification_path }} init-prod: @@ -144,7 +144,7 @@ jobs: file: common/openshift.fluentbit.yml overwrite: true steps: - - uses: bcgov-nr/action-deployer-openshift@v2.1.0 + - uses: bcgov-nr/action-deployer-openshift@v2.3.0 with: file: ${{ matrix.file }} oc_namespace: ${{ vars.OC_NAMESPACE }} @@ -154,5 +154,5 @@ jobs: parameters: -p ZONE=prod ${{ matrix.parameters }} - timeout: ${{ matrix.timeout }} + timeout: ${{ matrix.timeout || '10m' }} verification_path: ${{ matrix.verification_path }}