Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

- env:
API_NAME: nest
BASE_URL: https://${{ env.PREFIX }}-frontend.${{ env.DOMAIN }}
BASE_URL: https://${{ env.PREFIX }}.${{ env.DOMAIN }}
run: |
cd tests/integration
npm ci
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:

- name: Run Tests
env:
E2E_BASE_URL: https://${{ github.event.repository.name }}-${{ inputs.target }}-frontend.${{ env.DOMAIN }}/
E2E_BASE_URL: https://${{ github.event.repository.name }}-${{ inputs.target }}.${{ env.DOMAIN }}/
CI: "true"
run: |
npx playwright test --project="${{ matrix.project }}" --reporter=html
Expand All @@ -90,8 +90,8 @@ jobs:
- uses: grafana/setup-k6-action@ffe7d7290dfa715e48c2ccc924d068444c94bde2 # v1.1.0
- uses: grafana/run-k6-action@a15e2072ede004e8d46141e33d7f7dad8ad08d9d # v1.3.1
env:
BACKEND_URL: https://${{ env.PREFIX }}-frontend.${{ env.DOMAIN }}/api
FRONTEND_URL: https://${{ env.PREFIX }}-frontend.${{ env.DOMAIN }}
BACKEND_URL: https://${{ env.PREFIX }}.${{ env.DOMAIN }}/api
FRONTEND_URL: https://${{ env.PREFIX }}.${{ env.DOMAIN }}
with:
path: ./tests/load/${{ matrix.name }}-test.js
flags: --vus 100 --duration 300s
4 changes: 2 additions & 2 deletions .github/workflows/demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:
workflow_dispatch:
inputs:
target:
description: 'PR number to receive DEMO URL routing'
description: "PR number to receive DEMO URL routing"
required: true
type: number
type: number

concurrency:
group: ${{ github.workflow }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-validate.yml@d9b3d32fb3f03c4699c2dce83ddfff042cd31a1f # v1.0.0
with:
markdown_links: |
- [Frontend](https://${{ github.event.repository.name }}-${{ github.event.number }}-frontend.apps.silver.devops.gov.bc.ca)
- [Backend](https://${{ github.event.repository.name }}-${{ github.event.number }}-frontend.apps.silver.devops.gov.bc.ca/api)
- [Frontend](https://${{ github.event.repository.name }}-${{ github.event.number }}.apps.silver.devops.gov.bc.ca)
- [Backend](https://${{ github.event.repository.name }}-${{ github.event.number }}.apps.silver.devops.gov.bc.ca/api)

results:
name: Validate Results
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ jobs:
artifact_name: ${{ matrix.name }}
issue_title: "ZAP Security Report: ${{ matrix.name }}"
token: ${{ secrets.GITHUB_TOKEN }}
target: https://${{ github.event.repository.name }}-test-frontend.apps.silver.devops.gov.bc.ca/${{ matrix.path }}
target: https://${{ github.event.repository.name }}-test.apps.silver.devops.gov.bc.ca/${{ matrix.path }}
2 changes: 1 addition & 1 deletion charts/app/templates/frontend/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ metadata:
spec:
ingressClassName: openshift-default
rules:
- host: {{ include "frontend.fullname" . }}.{{ .Values.global.domain }}
- host: {{ .Release.Name }}.{{ .Values.global.domain }}
http:
paths:
- path: /
Expand Down
3 changes: 1 addition & 2 deletions frontend/e2e/utils/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export const baseURL =
process.env.E2E_BASE_URL ||
'https://quickstart-openshift-test-frontend.apps.silver.devops.gov.bc.ca/'
process.env.E2E_BASE_URL || 'https://quickstart-openshift-test.apps.silver.devops.gov.bc.ca/'
Loading