Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated nightwatch workflow to e2e #1320

Merged
merged 2 commits into from
Oct 23, 2023
Merged

Updated nightwatch workflow to e2e #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb92c4d
Updated nightwatch workflow to e2e
MarkCalvert Oct 13, 2023
0119444
Updated test_type parameter value to e2e
MarkCalvert Oct 23, 2023
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
10 changes: 5 additions & 5 deletions .github/workflows/nightwatch.yml → .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: dpc-sdp/ripple/nightwatch
name: dpc-sdp/ripple/e2e
MarkCalvert marked this conversation as resolved.
Show resolved Hide resolved
on:
workflow_dispatch:
inputs:
Expand All @@ -19,7 +19,7 @@ jobs:
project: ${{ inputs.project }}
browser: 'chrome'
test_id: 'fixture'
test_type: ':nightwatch:'
test_type: ':e2e:'
runner: 'ubuntu-latest'
e2e_fe_smoke:
uses: dpc-sdp/github-actions/.github/workflows/run_e2e_fe.yml@main
Expand All @@ -31,7 +31,7 @@ jobs:
project: ${{ inputs.project }}
browser: 'chrome'
test_id: 'fixture'
test_type: ':nightwatch:'
test_type: ':e2e:'
runner: 'ubuntu-latest'
e2e_fe_chrome:
needs:
Expand All @@ -46,7 +46,7 @@ jobs:
project: ${{ inputs.project }}
browser: 'chrome'
test_id: 'fixture'
test_type: ':nightwatch:'
test_type: ':e2e:'
runner: 'ubuntu-latest'
e2e_fe_android:
needs:
Expand All @@ -61,5 +61,5 @@ jobs:
project: ${{ inputs.project }}
browser: 'androidChrome'
test_id: 'fixture'
test_type: ':nightwatch:'
test_type: ':e2e:'
runner: 'ubuntu-latest'
2 changes: 1 addition & 1 deletion .lagoon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ tasks:
fi
service: app
- run:
name: Trigger Nightwatch E2E Tests CI
name: Trigger E2E Tests CI
command: |-
. /app/scripts/trigger-e2e.sh
service: app
Expand Down
4 changes: 2 additions & 2 deletions scripts/trigger-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ fi

E2E_ESTUARY_URL="${E2E_ESTUARY_URL:-http://estuary.sdp-services:8080/v1/actions/trigger-e2e}"
E2E_ESTUARY_TOKEN_PATH="${E2E_ESTUARY_TOKEN_PATH:-/run/secrets/kubernetes.io/serviceaccount/token}"
# Trigger GitHub Action to run the nightwatch workflow via estuary
# Trigger GitHub Action to run the e2e workflow via estuary
curl --location --request POST "$E2E_ESTUARY_URL" \
--header "Authorization: Bearer $(cat $E2E_ESTUARY_TOKEN_PATH)" \
--header "Content-Type: application/json" \
--data-raw '{
"owner": "dpc-sdp",
"repo": "ripple",
"workflow": "nightwatch.yml",
"workflow": "e2e.yml",
"ref": "'"$BRANCH"'",
"be_url": "'"$BE_URL"'",
"fe_url": "'"$FE_URL"'",
Expand Down