Skip to content

Commit c07447a

Browse files
lerry-leelerry-lee
authored
Refine PR test template format (sonic-net#15636)
Why I did it Refine PR test template format. How I did it Refine PR test template format. How to verify it PR test executed normally. Signed-off-by: Chun'ang Li <chunangli@microsoft.com>
1 parent 9321c97 commit c07447a

File tree

2 files changed

+112
-32
lines changed

2 files changed

+112
-32
lines changed

‎.azure-pipelines/run-test-scheduler-template.yml

+94-20
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ parameters:
1818
type: string
1919
default: 1
2020

21+
- name: NUM_ASIC
22+
type: number
23+
default: 1
24+
2125
- name: TEST_SET
2226
type: string
2327
default: ""
@@ -34,13 +38,73 @@ parameters:
3438
type: string
3539
default: "ceos"
3640

41+
- name: TESTBED_NAME
42+
type: string
43+
default: ""
44+
45+
- name: IMAGE_URL
46+
type: string
47+
default: ""
48+
49+
- name: HWSKU
50+
type: string
51+
default: ""
52+
53+
- name: TEST_PLAN_TYPE
54+
type: string
55+
default: ""
56+
57+
- name: PLATFORM
58+
type: string
59+
default: ""
60+
61+
- name: SCRIPTS
62+
type: string
63+
default: ""
64+
65+
- name: FEATURES
66+
type: string
67+
default: ""
68+
69+
- name: SCRIPTS_EXCLUDE
70+
type: string
71+
default: ""
72+
73+
- name: FEATURES_EXCLUDE
74+
type: string
75+
default: ""
76+
77+
- name: REPO_NAME
78+
type: string
79+
default: ""
80+
3781
- name: MGMT_BRANCH
3882
type: string
39-
default: master
83+
default: ""
84+
85+
- name: STOP_ON_FAILURE
86+
type: string
87+
default: ""
4088

41-
- name: NUM_ASIC
89+
- name: RETRY_TIMES
90+
type: string
91+
default: ""
92+
93+
- name: DUMP_KVM_IF_FAIL
94+
type: string
95+
default: "True"
96+
values:
97+
- "True"
98+
- "False"
99+
100+
- name: REQUESTER
101+
type: string
102+
default: ""
103+
104+
- name: MAX_RUN_TEST_MINUTES
42105
type: number
43-
default: 1
106+
default: 480
107+
44108

45109
steps:
46110
- script: |
@@ -53,12 +117,20 @@ steps:
53117
set -e
54118
pip install PyYAML
55119
rm -f new_test_plan_id.txt
56-
python ./.azure-pipelines/test_plan.py create -t ${{ parameters.TOPOLOGY }} -o new_test_plan_id.txt \
57-
--min-worker ${{ parameters.MIN_WORKER }} --max-worker ${{ parameters.MAX_WORKER }} \
58-
--test-set ${{ parameters.TEST_SET }} --kvm-build-id $(KVM_BUILD_ID) \
59-
--deploy-mg-extra-params "${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" --common-extra-params "${{ parameters.COMMON_EXTRA_PARAMS }}" \
60-
--mgmt-branch ${{ parameters.MGMT_BRANCH }} --vm-type ${{ parameters.VM_TYPE }} \
120+
121+
python ./.azure-pipelines/test_plan.py create \
122+
-t ${{ parameters.TOPOLOGY }} \
123+
-o new_test_plan_id.txt \
124+
--min-worker ${{ parameters.MIN_WORKER }} \
125+
--max-worker ${{ parameters.MAX_WORKER }} \
126+
--test-set ${{ parameters.TEST_SET }} \
127+
--kvm-build-id $(KVM_BUILD_ID) \
128+
--deploy-mg-extra-params "${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" \
129+
--common-extra-params "${{ parameters.COMMON_EXTRA_PARAMS }}" \
130+
--mgmt-branch ${{ parameters.MGMT_BRANCH }} \
131+
--vm-type ${{ parameters.VM_TYPE }} \
61132
--num-asic ${{ parameters.NUM_ASIC }}
133+
62134
TEST_PLAN_ID=`cat new_test_plan_id.txt`
63135
64136
echo "Created test plan $TEST_PLAN_ID"
@@ -104,18 +176,20 @@ steps:
104176
env:
105177
TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
106178
displayName: Run test
107-
108-
- script: |
109-
set -e
110-
echo "KVM dump"
111-
echo "SONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com"
112-
echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID "
113-
# When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED"
114-
python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state KVMDUMP
115-
condition: succeededOrFailed()
116-
env:
117-
TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
118-
displayName: KVM dump
179+
timeoutInMinutes: ${{ parameters.MAX_RUN_TEST_MINUTES }}
180+
181+
- ${{ if eq(parameters.DUMP_KVM_IF_FAIL, 'True') }}:
182+
- script: |
183+
set -e
184+
echo "KVM dump"
185+
echo "SONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com"
186+
echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID "
187+
# When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED"
188+
python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state KVMDUMP
189+
condition: succeededOrFailed()
190+
env:
191+
TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
192+
displayName: KVM dump
119193
120194
- script: |
121195
set -e

‎azure-pipelines.yml

+18-12
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ stages:
157157
TOPOLOGY: t0
158158
MIN_WORKER: $(T0_INSTANCE_NUM)
159159
MAX_WORKER: $(T0_INSTANCE_NUM)
160+
MGMT_BRANCH: master
160161

161162
- job: t0_2vlans_elastictest
162163
pool: ubuntu-20.04
@@ -170,6 +171,7 @@ stages:
170171
TEST_SET: t0-2vlans
171172
MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM)
172173
MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM)
174+
MGMT_BRANCH: master
173175
DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
174176

175177
- job: t1_lag_elastictest
@@ -183,6 +185,7 @@ stages:
183185
TOPOLOGY: t1-lag
184186
MIN_WORKER: $(T1_LAG_INSTANCE_NUM)
185187
MAX_WORKER: $(T1_LAG_INSTANCE_NUM)
188+
MGMT_BRANCH: master
186189

187190
- job: multi_asic_elastictest
188191
displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
@@ -197,6 +200,7 @@ stages:
197200
MIN_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
198201
MAX_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
199202
NUM_ASIC: 4
203+
MGMT_BRANCH: master
200204

201205
- job: dualtor_elastictest
202206
pool: ubuntu-20.04
@@ -209,6 +213,7 @@ stages:
209213
TOPOLOGY: dualtor
210214
MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
211215
MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
216+
MGMT_BRANCH: master
212217
COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
213218

214219
- job: sonic_t0_elastictest
@@ -223,18 +228,19 @@ stages:
223228
MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
224229
MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
225230
TEST_SET: t0-sonic
231+
MGMT_BRANCH: master
226232
COMMON_EXTRA_PARAMS: "--neighbor_type=sonic "
227233
VM_TYPE: vsonic
228234

229-
- job: wan_elastictest
230-
displayName: "kvmtest-wan by Elastictest"
231-
pool: ubuntu-20.04
232-
timeoutInMinutes: 240
233-
continueOnError: false
234-
steps:
235-
- template: .azure-pipelines/run-test-scheduler-template.yml
236-
parameters:
237-
TOPOLOGY: wan-pub
238-
MIN_WORKER: $(WAN_INSTANCE_NUM)
239-
MAX_WORKER: $(WAN_INSTANCE_NUM)
240-
COMMON_EXTRA_PARAMS: "--skip_sanity "
235+
# - job: wan_elastictest
236+
# displayName: "kvmtest-wan by Elastictest"
237+
# pool: ubuntu-20.04
238+
# timeoutInMinutes: 240
239+
# continueOnError: false
240+
# steps:
241+
# - template: .azure-pipelines/run-test-scheduler-template.yml
242+
# parameters:
243+
# TOPOLOGY: wan-pub
244+
# MIN_WORKER: $(WAN_INSTANCE_NUM)
245+
# MAX_WORKER: $(WAN_INSTANCE_NUM)
246+
# COMMON_EXTRA_PARAMS: "--skip_sanity "

0 commit comments

Comments
 (0)