Skip to content

Commit 4888455

Browse files
Merge branch 'master' into skip_unknown_mac_test_for_cisco8k
2 parents 0a8455f + 8741165 commit 4888455

File tree

570 files changed

+12625
-4279
lines changed

Some content is hidden

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

570 files changed

+12625
-4279
lines changed

.azure-pipelines/pr_test_scripts.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ t0:
1212
- cacl/test_cacl_function.py
1313
- dhcp_relay/test_dhcp_relay.py
1414
- dhcp_relay/test_dhcpv6_relay.py
15+
- dns/test_dns_resolv_conf.py
1516
- generic_config_updater/test_aaa.py
1617
- generic_config_updater/test_bgpl.py
1718
- generic_config_updater/test_bgp_prefix.py

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

Lines changed: 84 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,70 @@ parameters:
3838
type: string
3939
default: "ceos"
4040

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+
81+
- name: MGMT_BRANCH
82+
type: string
83+
default: ""
84+
85+
- name: STOP_ON_FAILURE
86+
type: string
87+
default: ""
88+
89+
- name: RETRY_TIMES
90+
type: string
91+
default: ""
92+
93+
- name: DUMP_KVM_IF_FAIL
94+
type: string
95+
default: ""
96+
97+
- name: REQUESTER
98+
type: string
99+
default: ""
100+
101+
- name: MAX_EXECUTE_SECONDS
102+
type: string
103+
default: ""
104+
41105
- name: SPECIFIED_PARAMS
42106
type: string
43107
default: "{}"
@@ -52,8 +116,26 @@ steps:
52116
53117
python ./.azure-pipelines/test_plan.py create -t ${{ parameters.TOPOLOGY }} -o new_test_plan_id.txt --min-worker ${{ parameters.MIN_WORKER }} --max-worker ${{ parameters.MAX_WORKER }} \
54118
--test-set ${{ parameters.TEST_SET }} --kvm-build-id $(KVM_BUILD_ID) \
55-
--deploy-mg-extra-params "${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" --common-extra-params "${{ parameters.COMMON_EXTRA_PARAMS }}" \
56-
--vm-type ${{ parameters.VM_TYPE }} --specified-params "${{ parameters.SPECIFIED_PARAMS }}" --num-asic ${{ parameters.NUM_ASIC }}
119+
--deploy-mg-extra-params "${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" \
120+
--common-extra-params "${{ parameters.COMMON_EXTRA_PARAMS }}" \
121+
--specified-params "${{ parameters.SPECIFIED_PARAMS }}" \
122+
--vm-type ${{ parameters.VM_TYPE }} --num-asic ${{ parameters.NUM_ASIC }} \
123+
--image_url ${{ parameters.IMAGE_URL }} \
124+
--hwsku ${{ parameters.HWSKU }} \
125+
--test-plan-type ${{ parameters.TEST_PLAN_TYPE }} \
126+
--platform ${{ parameters.PLATFORM }} \
127+
--testbed-name "${{ parameters.TESTBED_NAME }}" \
128+
--scripts "${{ parameters.SCRIPTS }}" \
129+
--features "${{ parameters.FEATURES }}" \
130+
--scripts-exclude "${{ parameters.SCRIPTS_EXCLUDE }}" \
131+
--features-exclude "${{ parameters.FEATURES_EXCLUDE }}" \
132+
--repo-name ${{ parameters.REPO_NAME }} \
133+
--mgmt-branch ${{ parameters.MGMT_BRANCH }} \
134+
--stop-on-failure ${{ parameters.STOP_ON_FAILURE }} \
135+
--retry-times ${{ parameters.RETRY_TIMES }} \
136+
--dump-kvm-if-fail ${{ parameters.DUMP_KVM_IF_FAIL }} \
137+
--requester "${{ parameters.REQUESTER }}" \
138+
--max-execute-seconds ${{ parameters.MAX_EXECUTE_SECONDS }}
57139
58140
TEST_PLAN_ID=`cat new_test_plan_id.txt`
59141

0 commit comments

Comments
 (0)