Skip to content

Commit 1cef452

Browse files
committed
Workflow Fixes
1 parent 4a0e55c commit 1cef452

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

.github/workflows/prod.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ permissions:
1616
jobs:
1717
deploy-pre:
1818
runs-on: ubuntu-latest
19+
name: Create Tag Variable (remove V)
1920
timeout-minutes: 1
2021
outputs:
2122
tag: ${{ steps.vars.outputs.tag }}
@@ -31,7 +32,7 @@ jobs:
3132
addDockerTag:
3233
needs: [deploy-pre]
3334
runs-on: ubuntu-latest
34-
name: addDockerTag
35+
name: Add latest-prod Tag
3536
steps:
3637
- name: Add latest-prod tag to django image
3738
uses: shrink/actions-docker-registry-tag@v3
@@ -69,7 +70,7 @@ jobs:
6970
deploy:
7071
needs: [deploy-pre]
7172
runs-on: ubuntu-latest
72-
name: deploy
73+
name: Promote Images to OpenShift
7374
environment:
7475
name: prod
7576
url: https://beta.drivebc.ca/
@@ -82,7 +83,7 @@ jobs:
8283
with:
8384
openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }}
8485
openshift_token: ${{ secrets.OPENSHIFT_TOKEN }}
85-
namespace: c59ecc-test
86+
namespace: ${{ env.OPENSHIFT_NAMESPACE }}
8687
insecure_skip_tls_verify: true
8788

8889
- name: Helm upgrade on OpenShift Environment

.github/workflows/test.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ env:
2020
jobs:
2121
tag:
2222
if: startsWith(github.ref, 'refs/heads/') == true
23+
name: Create Tag
2324
runs-on: ubuntu-latest
2425
timeout-minutes: 5
2526
permissions:
@@ -39,6 +40,7 @@ jobs:
3940
4041
build-pre:
4142
needs: [tag]
43+
name: Create Tag Variable (remove V)
4244
runs-on: ubuntu-latest
4345
timeout-minutes: 1
4446
outputs:
@@ -181,9 +183,9 @@ jobs:
181183
username: ${{ env.REGISTRY_USER }}
182184
password: ${{ env.REGISTRY_PASSWORD }}
183185

184-
186+
185187
versionUpdate:
186-
needs: [build-static, build-backend, build-image-caching, build-redis]
188+
needs: [build-pre, build-static, build-backend, build-image-caching, build-redis]
187189
runs-on: ubuntu-latest
188190
name: Deploy Latest Images
189191
environment:
@@ -205,6 +207,5 @@ jobs:
205207

206208
- name: Helm upgrade on OpenShift Environment
207209
run: |
208-
echo ${{ needs.build-pre.outputs.tag }}
209210
helm dependency update ./infrastructure/main
210211
helm upgrade test-drivebc -f ./infrastructure/main/values-test.yaml ./infrastructure/main --set django.image.tag="${{ needs.build-pre.outputs.tag }}" --set image-caching.image.tag="${{ needs.build-pre.outputs.tag }}" --set redis.image.tag="${{ needs.build-pre.outputs.tag }}" --set static.image.tag="${{ needs.build-pre.outputs.tag }}" --set tasks.image.tag="${{ needs.build-pre.outputs.tag }}"

.github/workflows/uat.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ permissions:
1414
jobs:
1515
deploy-pre:
1616
runs-on: ubuntu-latest
17+
name: Create Tag Variable (remove V)
1718
timeout-minutes: 1
1819
outputs:
1920
tag: ${{ steps.vars.outputs.tag }}
@@ -33,7 +34,7 @@ jobs:
3334
addDockerTag:
3435
needs: [deploy-pre]
3536
runs-on: ubuntu-latest
36-
name: addDockerTag
37+
name: Add latest-uat Tag
3738
steps:
3839
- name: Add latest-uat tag to django image
3940
uses: shrink/actions-docker-registry-tag@v3
@@ -71,10 +72,10 @@ jobs:
7172
deploy:
7273
needs: [deploy-pre]
7374
runs-on: ubuntu-latest
74-
name: deploy
75+
name: Promote Images to OpenShift
7576
environment:
7677
name: uat
77-
url: https://uat-drivebc.apps.silver.devops.gov.bc.ca/
78+
url: https://uat-drivebc.apps.gold.devops.gov.bc.ca/
7879
steps:
7980
- name: Checkout Code
8081
uses: actions/checkout@v4
@@ -84,7 +85,7 @@ jobs:
8485
with:
8586
openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }}
8687
openshift_token: ${{ secrets.OPENSHIFT_TOKEN }}
87-
namespace: c59ecc-test
88+
namespace: ${{ env.OPENSHIFT_NAMESPACE }}
8889
insecure_skip_tls_verify: true
8990

9091
- name: Helm upgrade on OpenShift Environment

0 commit comments

Comments
 (0)