Skip to content

Commit

Permalink
ci: fix workflow parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
Ricardo Campos committed Nov 2, 2023
1 parent 216b115 commit 34e002e
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 6 deletions.
14 changes: 11 additions & 3 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,14 @@ jobs:
include:
- name: database
- name: backend
parameters:
-p PROMOTE=${{ github.repository }}/${{ matrix.name }}:test
verification_path: "actuator/health"
- name: frontend
parameters:
-p VITE_USER_POOLS_ID=${{ vars.VITE_USER_POOLS_ID }}
-p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
-p PROMOTE=${{ github.repository }}/${{ matrix.name }}:test
steps:
- uses: bcgov-nr/[email protected]
with:
Expand All @@ -77,7 +80,7 @@ jobs:
oc_token: ${{ secrets.OC_TOKEN }}
overwrite: true
parameters:
-p ZONE=test -p PROMOTE=${{ github.repository }}/${{ matrix.name }}:test
-p ZONE=test
-p NAME=${{ github.event.repository.name }}
${{ matrix.parameters }}
penetration_test: true
Expand Down Expand Up @@ -113,11 +116,15 @@ jobs:
include:
- name: database
- name: backend
parameters:
-p PROMOTE=${{ github.repository }}/${{ matrix.name }}:test
- name: frontend
parameters:
-p PROMOTE=${{ github.repository }}/${{ matrix.name }}:test
paratemeters:
-p VITE_USER_POOLS_ID=${{ vars.VITE_USER_POOLS_ID }}
-p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
-p VITE_REDIRECT_SIGN_OUT="${{ vars.VITE_REDIRECT_SIGN_OUT }}"
- name: frontend
steps:
- uses: bcgov-nr/[email protected]
with:
Expand All @@ -127,8 +134,9 @@ jobs:
oc_token: ${{ secrets.OC_TOKEN }}
overwrite: true
parameters:
-p ZONE=prod -p PROMOTE=${{ github.repository }}/${{ matrix.name }}:test
-p ZONE=prod
-p NAME=${{ github.event.repository.name }}
${{ matrix.parameters }}

image-promotions:
name: Promote images to PROD
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/pr-open.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,19 @@ jobs:
file: backend/openshift.deploy.yml
triggers: ('common/' 'database/' 'backend/' 'frontend/')
verification_path: /actuator/health
parameters:
-p PROMOTE=${{ github.repository }}/${{ matrix.name }}:${{ github.event.number }}
-p MIN_REPLICAS=1
-p MAX_REPLICAS=2
- name: frontend
file: frontend/openshift.deploy.yml
triggers: ('common/' 'database/' 'backend/' 'frontend/')
parameters:
-p VITE_USER_POOLS_ID=${{ vars.VITE_USER_POOLS_ID }}
-p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
-p PROMOTE=${{ github.repository }}/${{ matrix.name }}:${{ github.event.number }}
-p MIN_REPLICAS=1
-p MAX_REPLICAS=2
steps:
- uses: bcgov-nr/[email protected]
with:
Expand All @@ -111,9 +118,8 @@ jobs:
oc_token: ${{ secrets.OC_TOKEN }}
overwrite: true
parameters:
-p ZONE=${{ github.event.number }} -p NAME=${{ github.event.repository.name }}
-p PROMOTE=${{ github.repository }}/${{ matrix.name }}:${{ github.event.number }}
-p MIN_REPLICAS=1 -p MAX_REPLICAS=2
-p ZONE=${{ github.event.number }}
-p NAME=${{ github.event.repository.name }}
${{ matrix.parameters }}
triggers: ${{ matrix.triggers }}
verification_path: ${{ matrix.verification_path }}

0 comments on commit 34e002e

Please sign in to comment.