Cleanup output

bcgov · Jan 15, 2022 · de45c37 · de45c37
1 parent 0298cdb
commit de45c37
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -76,15 +76,17 @@ jobs:
           oc project ${{ secrets.NAMESPACE }}
 
           # Cancel any rollouts in progress
-          oc rollout cancel dc/gfp-${{ github.event.number }} || true
+          oc rollout cancel dc/gfp-${{ github.event.number }} 2> /dev/null \
+            || true && echo "No rollout in progress"
 
           # Process and apply deployment template
           oc process -f .pipeline/deploy.yml \
             -p SUFFIX=${{ github.event.number }} -p ENV=${{ secrets.ENV }} \
               | oc apply -f -
 
-          # Start rollout (if one hasn't started) and follow it
-          oc rollout latest dc/gfp-${{ github.event.number }} || true
+          # Start rollout (if necessary) and follow it
+          oc rollout latest dc/gfp-${{ github.event.number }} 2> /dev/null \
+            || true && echo "Rollout in progress"
           oc logs -f dc/gfp-${{ github.event.number }}
 
           # Get status, returns 0 if rollout is successful