diff --git a/.github/workflows/nightwatch.yml b/.github/workflows/e2e.yml similarity index 91% rename from .github/workflows/nightwatch.yml rename to .github/workflows/e2e.yml index 9af2c22ba..21c02d046 100644 --- a/.github/workflows/nightwatch.yml +++ b/.github/workflows/e2e.yml @@ -1,4 +1,4 @@ -name: dpc-sdp/ripple/nightwatch +name: dpc-sdp/ripple/e2e on: workflow_dispatch: inputs: @@ -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 @@ -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: @@ -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: @@ -61,5 +61,5 @@ jobs: project: ${{ inputs.project }} browser: 'androidChrome' test_id: 'fixture' - test_type: ':nightwatch:' + test_type: ':e2e:' runner: 'ubuntu-latest' diff --git a/.lagoon.yml b/.lagoon.yml index 144bfdfeb..4f13d045f 100644 --- a/.lagoon.yml +++ b/.lagoon.yml @@ -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 diff --git a/scripts/trigger-e2e.sh b/scripts/trigger-e2e.sh index c5db57a66..4c26b02a9 100644 --- a/scripts/trigger-e2e.sh +++ b/scripts/trigger-e2e.sh @@ -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"'",