Skip to content

Commit 007cb06

Browse files
Adde https prefix to CONTAINER_API_APPURL and minor changes
1 parent 70bd053 commit 007cb06

2 files changed

Lines changed: 10 additions & 14 deletions

File tree

.github/workflows/deploy-v2.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ on:
4141
required: false
4242
default: false
4343
type: boolean
44+
45+
cleanup_resources:
46+
description: 'Cleanup Deployed Resources'
47+
required: false
48+
default: false
49+
type: boolean
50+
4451
run_e2e_tests:
4552
description: 'Run End-to-End Tests'
4653
required: false
@@ -50,11 +57,6 @@ on:
5057
- 'GoldenPath-Testing'
5158
- 'Smoke-Testing'
5259
- 'None'
53-
cleanup_resources:
54-
description: 'Cleanup Deployed Resources'
55-
required: false
56-
default: false
57-
type: boolean
5860

5961
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
6062
description: 'Log Analytics Workspace ID (Optional)'
@@ -568,7 +570,7 @@ jobs:
568570
569571
570572
# Export variables only after successful deploy
571-
export CONTAINER_API_APPURL=$(echo "$DEPLOY_OUTPUT" | jq -r '.CONTAINER_API_APP_FQDN // empty')
573+
export CONTAINER_API_APPURL="https://$(echo "$DEPLOY_OUTPUT" | jq -r '.CONTAINER_API_APP_FQDN // empty')"
572574
echo "CONTAINER_API_APPURL=$CONTAINER_API_APPURL" >> $GITHUB_ENV
573575
574576
export CONTAINER_API_APPNAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.CONTAINER_API_APP_NAME // empty')

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,8 @@ jobs:
9595
id: test1
9696
run: |
9797
if [ "${{ env.test_suite }}" == "GoldenPath-Testing" ]; then
98-
echo "Running Golden Path Tests..."
9998
xvfb-run pytest -m gp --headed --html=report/report.html --self-contained-html
10099
else
101-
echo "Running All Tests..."
102100
xvfb-run pytest --headed --html=report/report.html --self-contained-html
103101
fi
104102
working-directory: tests/e2e-test
@@ -114,10 +112,8 @@ jobs:
114112
if: ${{ steps.test1.outcome == 'failure' }}
115113
run: |
116114
if [ "${{ env.test_suite }}" == "GoldenPath-Testing" ]; then
117-
echo "Running Golden Path Tests..."
118115
xvfb-run pytest -m gp --headed --html=report/report.html --self-contained-html
119116
else
120-
echo "Running All Tests..."
121117
xvfb-run pytest --headed --html=report/report.html --self-contained-html
122118
fi
123119
working-directory: tests/e2e-test
@@ -133,10 +129,8 @@ jobs:
133129
if: ${{ steps.test2.outcome == 'failure' }}
134130
run: |
135131
if [ "${{ env.test_suite }}" == "GoldenPath-Testing" ]; then
136-
echo "Running Golden Path Tests..."
137132
xvfb-run pytest -m gp --headed --html=report/report.html --self-contained-html
138133
else
139-
echo "Running All Tests..."
140134
xvfb-run pytest --headed --html=report/report.html --self-contained-html
141135
fi
142136
working-directory: tests/e2e-test
@@ -154,9 +148,9 @@ jobs:
154148
run: |
155149
# Determine test suite type for title
156150
if [ "${{ env.test_suite }}" == "GoldenPath-Testing" ]; then
157-
echo "## 🧪 E2E Test Job Summary : Golden Path testing" >> $GITHUB_STEP_SUMMARY
151+
echo "## 🧪 E2E Test Job Summary : Golden Path Testing" >> $GITHUB_STEP_SUMMARY
158152
else
159-
echo "## 🧪 E2E Test Job Summary : Smoke testing" >> $GITHUB_STEP_SUMMARY
153+
echo "## 🧪 E2E Test Job Summary : Smoke Testing" >> $GITHUB_STEP_SUMMARY
160154
fi
161155
echo "" >> $GITHUB_STEP_SUMMARY
162156
echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)