Skip to content

Commit bc24a9f

Browse files
authored
[azp]: Add sonictest-sonic-t0 test (#4341)
Add the pool for SONiC VM as the neighbor devices - Add sonictest-sonic-t0 pool in azurepipeline - Change SONiC SKU to SONiC-VM in ansible playbook Signed-off-by: Ze Gan <[email protected]>
1 parent dcc705f commit bc24a9f

4 files changed

Lines changed: 17 additions & 3 deletions

File tree

ansible/roles/sonic/tasks/vsonic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
- name: create interface config
3232
shell: >
33-
sonic-cfggen -p /usr/share/sonic/device/x86_64-kvm_x86_64-r0/Force10-S6000/port_config.ini -k Force10-S6000 --print-data
33+
sonic-cfggen -p /usr/share/sonic/device/x86_64-kvm_x86_64-r0/SONiC-VM/port_config.ini -k SONiC-VM --print-data
3434
| jq '.PORT[].admin_status |= "up"'
3535
> config-port.json
3636
when: hostname in configuration

ansible/roles/sonic/templates/configdb-t0-leaf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
{% if iface['lacp'] is defined %}
2222
"PORTCHANNEL_MEMBER": {
2323
{% set index = name | replace("Ethernet", "") | int - 1 %}
24-
"PortChannel{{ iface['lacp'] }}|Ethernet{{ index * 4}}": {}
24+
"PortChannel{{ iface['lacp'] }}|Ethernet{{ index + 1}}": {}
2525
},
2626
{% endif %}
2727
{% endfor %}

azure-pipelines.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,17 @@ stages:
4545
ptf_name: ptf_vms6-2
4646
tbtype: t1-lag
4747
vmtype: ceos
48+
49+
- job:
50+
pool: sonictest-sonic-t0
51+
displayName: "kvmtest-t0-sonic"
52+
timeoutInMinutes: 240
53+
54+
steps:
55+
- template: .azure-pipelines/run-test-template.yml
56+
parameters:
57+
dut: vlab-01
58+
tbname: vms-kvm-t0
59+
ptf_name: ptf_vms6-1
60+
tbtype: t0-sonic
61+
vmtype: vsonic

tests/kvmtest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ test_t0_sonic() {
164164
tests="bgp/test_bgp_fact.py"
165165

166166
pushd $SONIC_MGMT_DIR/tests
167-
./run_tests.sh $RUNTEST_CLI_COMMON_OPTS -c "$tests" -p logs/$tgname -e "--neighbor_type=sonic --skip_sanity --disable_loganalyzer"
167+
./run_tests.sh $RUNTEST_CLI_COMMON_OPTS -c "$tests" -p logs/$tgname -e "--neighbor_type=sonic"
168168
popd
169169
}
170170

0 commit comments

Comments
 (0)