chore(ci): merge timeout deployment faile (#277)

bcgov · Apr 5, 2024 · ca9c465 · ca9c465
1 parent 22b2711
commit ca9c465
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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 }}