Skip to content

Commit a25c74e

Browse files
authored
fix: oc_server default, improve workflow checks (#174)
1 parent 3116748 commit a25c74e

File tree

3 files changed

+18
-27
lines changed

3 files changed

+18
-27
lines changed

.github/workflows/.pr-close.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ on:
6666

6767
permissions: {}
6868

69+
env:
70+
DEFAULT_OC_SERVER: https://api.silver.devops.gov.bc.ca:6443
71+
6972
jobs:
7073
vars:
7174
if: inputs.packages != ''
@@ -120,7 +123,7 @@ jobs:
120123
with:
121124
oc_namespace: ${{ secrets.oc_namespace }}
122125
oc_token: ${{ secrets.oc_token }}
123-
oc_server: ${{ secrets.oc_server }}
126+
oc_server: ${{ secrets.oc_server || env.DEFAULT_OC_SERVER }}
124127
commands: |
125128
# Cleanup for Helm deployments
126129
@@ -158,7 +161,7 @@ jobs:
158161
with:
159162
oc_namespace: ${{ secrets.oc_namespace }}
160163
oc_token: ${{ secrets.oc_token }}
161-
oc_server: ${{ secrets.oc_server }}
164+
oc_server: ${{ secrets.oc_server || env.DEFAULT_OC_SERVER }}
162165
commands: |
163166
# Cleanup for OpenShift template deployments, uses labels
164167
@@ -171,7 +174,7 @@ jobs:
171174
with:
172175
oc_namespace: ${{ secrets.oc_namespace }}
173176
oc_token: ${{ secrets.oc_token }}
174-
oc_server: ${{ secrets.oc_server }}
177+
oc_server: ${{ secrets.oc_server || env.DEFAULT_OC_SERVER }}
175178
commands: |
176179
# Remove PVCs from OpenShift when PR closed
177180
echo "${{ inputs.remove_pvc }}" | while IFS= read -r pvc; do

.github/workflows/pr-close.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.github/workflows/pr-open.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,18 @@ jobs:
8686
promote_tags: pr
8787
repository: bcgov/quickstart-openshift
8888

89+
cleanup:
90+
name: Cleanup
91+
needs: [deploys]
92+
permissions:
93+
packages: write
94+
uses: ./.github/workflows/.pr-close.yml
95+
secrets: inherit
96+
with:
97+
cleanup: helm
98+
packages: backend frontend migrations
99+
tag_promote: latest
100+
89101
csr-generator: # testing, will be deleted
90102
name: Certificate Generation
91103
uses: ./.github/workflows/csr-generator.yml

0 commit comments

Comments
 (0)