Skip to content

Commit ba1908b

Browse files
Integrate Smoke testing within pipeline
1 parent a483104 commit ba1908b

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

.github/workflows/deploy-orchestrator.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ jobs:
100100
secrets: inherit
101101

102102
e2e-test:
103-
# if: "!cancelled() && ((needs.deploy.result == 'success' && needs.deploy.outputs.WEB_APPURL != '') || (inputs.existing_webapp_url != '' && inputs.existing_webapp_url != null)) && (inputs.trigger_type != 'workflow_dispatch' || (inputs.run_e2e_tests != 'None' && inputs.run_e2e_tests != '' && inputs.run_e2e_tests != null))"
104-
if: false # Temporarily disable E2E tests
103+
if: "!cancelled() && ((needs.deploy.result == 'success' && needs.deploy.outputs.WEB_APPURL != '') || (inputs.existing_webapp_url != '' && inputs.existing_webapp_url != null)) && (inputs.trigger_type != 'workflow_dispatch' || (inputs.run_e2e_tests != 'None' && inputs.run_e2e_tests != '' && inputs.run_e2e_tests != null))"
105104
needs: [docker-build, deploy]
106105
uses: ./.github/workflows/test-automation-v2.yml
107106
with:

.github/workflows/test-automation-v2.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
id: test1
9595
run: |
9696
if [ "${{ env.test_suite }}" == "GoldenPath-Testing" ]; then
97-
xvfb-run pytest -m goldenpath --html=report/report.html --self-contained-html
97+
xvfb-run pytest -m gp --html=report/report.html --self-contained-html
9898
else
9999
xvfb-run pytest --html=report/report.html --self-contained-html
100100
fi
@@ -111,7 +111,7 @@ jobs:
111111
if: ${{ steps.test1.outcome == 'failure' }}
112112
run: |
113113
if [ "${{ env.test_suite }}" == "GoldenPath-Testing" ]; then
114-
xvfb-run pytest -m goldenpath --html=report/report.html --self-contained-html
114+
xvfb-run pytest -m gp --html=report/report.html --self-contained-html
115115
else
116116
xvfb-run pytest --html=report/report.html --self-contained-html
117117
fi
@@ -128,7 +128,7 @@ jobs:
128128
if: ${{ steps.test2.outcome == 'failure' }}
129129
run: |
130130
if [ "${{ env.test_suite }}" == "GoldenPath-Testing" ]; then
131-
xvfb-run pytest -m goldenpath --html=report/report.html --self-contained-html
131+
xvfb-run pytest -m gp --html=report/report.html --self-contained-html
132132
else
133133
xvfb-run pytest --html=report/report.html --self-contained-html
134134
fi

0 commit comments

Comments
 (0)