Skip to content

Commit b15859c

Browse files
rraghav-ciscorraghav-cisco
committed
Merge branch 'master' into cont_link_flap_test_counters Signed-off-by: Raghavendran Ramanathan <rraghav@cisco.com>
2 parents 3a65ec8 + e17e06e commit b15859c

File tree

123 files changed

+4959
-1541
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+4959
-1541
lines changed

‎.azure-pipelines/baseline_test/baseline.test.mgmt.public.yml‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,10 @@ stages:
4646
jobs:
4747
- template: ../pr_test_template.yml
4848
parameters:
49-
GLOBAL_PARAMS:
50-
BUILD_REASON: ${{ parameters.BUILD_REASON }}
51-
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
52-
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
53-
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
49+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
50+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
51+
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
52+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
5453

5554
- stage: Test_round_2
5655
dependsOn:
@@ -59,11 +58,10 @@ stages:
5958
jobs:
6059
- template: ../pr_test_template.yml
6160
parameters:
62-
GLOBAL_PARAMS:
63-
BUILD_REASON: ${{ parameters.BUILD_REASON }}
64-
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
65-
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
66-
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
61+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
62+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
63+
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
64+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
6765

6866
- stage: Test_round_3
6967
dependsOn:
@@ -72,11 +70,10 @@ stages:
7270
jobs:
7371
- template: ../pr_test_template.yml
7472
parameters:
75-
GLOBAL_PARAMS:
76-
BUILD_REASON: ${{ parameters.BUILD_REASON }}
77-
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
78-
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
79-
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
73+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
74+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
75+
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
76+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
8077

8178
- stage: Test_round_4
8279
dependsOn:
@@ -85,8 +82,7 @@ stages:
8582
jobs:
8683
- template: ../pr_test_template.yml
8784
parameters:
88-
GLOBAL_PARAMS:
89-
BUILD_REASON: ${{ parameters.BUILD_REASON }}
90-
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
91-
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
92-
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
85+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
86+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
87+
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
88+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}

‎.azure-pipelines/pr_test_template.yml‎

Lines changed: 104 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,38 @@ parameters:
44
default:
55
name: sonic-ubuntu-1c
66

7+
- name: BUILD_REASON
8+
type: string
9+
default: "PullRequest"
10+
11+
- name: RETRY_TIMES
12+
type: string
13+
default: "2"
14+
15+
- name: STOP_ON_FAILURE
16+
type: string
17+
default: "True"
18+
19+
- name: TEST_PLAN_NUM
20+
type: string
21+
default: "1"
22+
23+
- name: MAX_RUN_TEST_MINUTES
24+
type: number
25+
default: 480
26+
27+
- name: MGMT_COMMIT_HASH
28+
type: string
29+
default: ""
30+
31+
- name: PTF_MODIFIED
32+
type: string
33+
default: "False"
34+
35+
- name: EXPECTED_RESULT
36+
type: string
37+
default: ""
38+
739
- name: TIMEOUT_IN_MINUTES_PR_TEST
840
type: number
941
default: 640
@@ -22,18 +54,6 @@ parameters:
2254
type: object
2355
default: {}
2456

25-
- name: GLOBAL_PARAMS
26-
type: object
27-
default:
28-
BUILD_REASON: "PullRequest"
29-
RETRY_TIMES: "2"
30-
STOP_ON_FAILURE: "True"
31-
TEST_PLAN_NUM: "1"
32-
MAX_RUN_TEST_MINUTES: 480
33-
MGMT_COMMIT_HASH: ""
34-
PTF_MODIFIED: "False"
35-
EXPECTED_RESULT: ""
36-
3757
- name: OVERRIDE_PARAMS
3858
type: object
3959
default: {}
@@ -76,8 +96,14 @@ jobs:
7696

7797
- template: run-test-elastictest-template.yml
7898
parameters:
79-
${{ each param in parameters.GLOBAL_PARAMS }}:
80-
${{ param.key }}: ${{ param.value }}
99+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
100+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
101+
STOP_ON_FAILURE: ${{ parameters.STOP_ON_FAILURE }}
102+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
103+
MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
104+
MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
105+
PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
106+
EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
81107
TOPOLOGY: t0
82108
SCRIPTS: $(SCRIPTS)
83109
MIN_WORKER: $(INSTANCE_NUMBER)
@@ -110,8 +136,14 @@ jobs:
110136

111137
- template: run-test-elastictest-template.yml
112138
parameters:
113-
${{ each param in parameters.GLOBAL_PARAMS }}:
114-
${{ param.key }}: ${{ param.value }}
139+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
140+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
141+
STOP_ON_FAILURE: ${{ parameters.STOP_ON_FAILURE }}
142+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
143+
MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
144+
MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
145+
PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
146+
EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
115147
TOPOLOGY: t0
116148
SCRIPTS: $(SCRIPTS)
117149
MIN_WORKER: $(INSTANCE_NUMBER)
@@ -145,8 +177,14 @@ jobs:
145177

146178
- template: run-test-elastictest-template.yml
147179
parameters:
148-
${{ each param in parameters.GLOBAL_PARAMS }}:
149-
${{ param.key }}: ${{ param.value }}
180+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
181+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
182+
STOP_ON_FAILURE: ${{ parameters.STOP_ON_FAILURE }}
183+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
184+
MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
185+
MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
186+
PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
187+
EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
150188
TOPOLOGY: t1-lag
151189
SCRIPTS: $(SCRIPTS)
152190
MIN_WORKER: $(INSTANCE_NUMBER)
@@ -179,8 +217,14 @@ jobs:
179217

180218
- template: run-test-elastictest-template.yml
181219
parameters:
182-
${{ each param in parameters.GLOBAL_PARAMS }}:
183-
${{ param.key }}: ${{ param.value }}
220+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
221+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
222+
STOP_ON_FAILURE: ${{ parameters.STOP_ON_FAILURE }}
223+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
224+
MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
225+
MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
226+
PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
227+
EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
184228
TOPOLOGY: dualtor
185229
SCRIPTS: $(SCRIPTS)
186230
MIN_WORKER: $(INSTANCE_NUMBER)
@@ -213,8 +257,14 @@ jobs:
213257

214258
- template: run-test-elastictest-template.yml
215259
parameters:
216-
${{ each param in parameters.GLOBAL_PARAMS }}:
217-
${{ param.key }}: ${{ param.value }}
260+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
261+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
262+
STOP_ON_FAILURE: ${{ parameters.STOP_ON_FAILURE }}
263+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
264+
MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
265+
MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
266+
PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
267+
EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
218268
TOPOLOGY: t0-64-32
219269
SCRIPTS: $(SCRIPTS)
220270
MIN_WORKER: $(INSTANCE_NUMBER)
@@ -252,8 +302,14 @@ jobs:
252302

253303
- template: run-test-elastictest-template.yml
254304
parameters:
255-
${{ each param in parameters.GLOBAL_PARAMS }}:
256-
${{ param.key }}: ${{ param.value }}
305+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
306+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
307+
STOP_ON_FAILURE: ${{ parameters.STOP_ON_FAILURE }}
308+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
309+
MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
310+
MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
311+
PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
312+
EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
257313
TOPOLOGY: dpu
258314
SCRIPTS: $(SCRIPTS)
259315
MIN_WORKER: $(INSTANCE_NUMBER)
@@ -290,8 +346,14 @@ jobs:
290346

291347
- template: run-test-elastictest-template.yml
292348
parameters:
293-
${{ each param in parameters.GLOBAL_PARAMS }}:
294-
${{ param.key }}: ${{ param.value }}
349+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
350+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
351+
STOP_ON_FAILURE: ${{ parameters.STOP_ON_FAILURE }}
352+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
353+
MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
354+
MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
355+
PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
356+
EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
295357
TOPOLOGY: t1-8-lag
296358
SCRIPTS: $(SCRIPTS)
297359
MIN_WORKER: $(INSTANCE_NUMBER)
@@ -326,8 +388,14 @@ jobs:
326388

327389
- template: run-test-elastictest-template.yml
328390
parameters:
329-
${{ each param in parameters.GLOBAL_PARAMS }}:
330-
${{ param.key }}: ${{ param.value }}
391+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
392+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
393+
STOP_ON_FAILURE: ${{ parameters.STOP_ON_FAILURE }}
394+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
395+
MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
396+
MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
397+
PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
398+
EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
331399
TOPOLOGY: t2
332400
SCRIPTS: $(SCRIPTS)
333401
MIN_WORKER: $(INSTANCE_NUMBER)
@@ -340,12 +408,19 @@ jobs:
340408

341409
- job: t1_lag_vpp_elastictest
342410
displayName: "kvmtest-t1-lag-vpp by Elastictest [OPTIONAL]"
343-
timeoutInMinutes: 480
411+
timeoutInMinutes: ${{ parameters.TIMEOUT_IN_MINUTES_PR_TEST }}
344412
continueOnError: true
345413
pool: sonic-ubuntu-1c
346414
steps:
347415
- template: run-test-elastictest-template.yml
348416
parameters:
417+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
418+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
419+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
420+
MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
421+
MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
422+
PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
423+
EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
349424
TOPOLOGY: t1-lag-vpp
350425
MIN_WORKER: $(T1_LAG_VPP_INSTANCE_NUM)
351426
MAX_WORKER: $(T1_LAG_VPP_INSTANCE_NUM)
@@ -354,4 +429,3 @@ jobs:
354429
ASIC_TYPE: "vpp"
355430
KVM_IMAGE_BUILD_PIPELINE_ID: "2818"
356431
COMMON_EXTRA_PARAMS: "--disable_sai_validation --disable_loganalyzer"
357-
STOP_ON_FAILURE: "False"

‎.azure-pipelines/pre_defined_pr_test.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ stages:
4949
- template: pr_test_template.yml
5050
parameters:
5151
IMPACT_AREA_INFO: ${{ parameters.IMPACT_AREA_INFO }}
52-
GLOBAL_PARAMS:
53-
BUILD_REASON: ${{ parameters.BUILD_REASON }}
54-
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
55-
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
56-
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
57-
MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
52+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
53+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
54+
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
55+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
56+
MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}

0 commit comments

Comments
 (0)