Skip to content

Commit 84f6c5d

Browse files
liushilongbuaaliushilongbuaa
committed
fix
1 parent 28e0a61 commit 84f6c5d

File tree

1 file changed

+80
-79
lines changed

1 file changed

+80
-79
lines changed

‎azure-pipelines.yml

+80-79
Original file line numberDiff line numberDiff line change
@@ -47,82 +47,83 @@ stages:
4747
- name: broadcom
4848
- name: mellanox
4949
# TODO: test is failing now.
50-
# when fixed, we can uncomment it.
51-
#- stage: Test
52-
# variables:
53-
# - name: inventory
54-
# value: veos_vtb
55-
# - name: testbed_file
56-
# value: vtestbed.csv
57-
#
58-
# jobs:
59-
# - job:
60-
# pool: sonictest
61-
# displayName: "vstest"
62-
# timeoutInMinutes: 60
63-
# steps:
64-
# - checkout: self
65-
# clean: true
66-
# submodules: recursive
67-
# displayName: 'Checkout code'
68-
#
69-
# - task: DownloadPipelineArtifact@2
70-
# inputs:
71-
# source: specific
72-
# project: build
73-
# pipeline: 9
74-
# artifacts: sonic-swss-common.amd64.ubuntu20_04
75-
# runVersion: 'latestFromBranch'
76-
# runBranch: 'refs/heads/master'
77-
# displayName: "Download sonic swss common deb packages"
78-
#
79-
# - task: DownloadPipelineArtifact@2
80-
# inputs:
81-
# artifact: sonic-buildimage.vs
82-
# displayName: "Download sonic-buildimage.vs artifact"
83-
#
84-
# - script: |
85-
# set -x
86-
# sudo dpkg -i --force-confask,confnew ../sonic-swss-common.amd64.ubuntu20_04/libswsscommon_1.0.0_amd64.deb
87-
# sudo dpkg -i ../sonic-swss-common.amd64.ubuntu20_04/python3-swsscommon_1.0.0_amd64.deb
88-
# sudo docker load -i ../target/docker-sonic-vs.gz
89-
# docker tag docker-sonic-vs:latest docker-sonic-vs:$(Build.BuildNumber)
90-
# username=$(id -un)
91-
# trap "docker ps; docker images; ip netns list; \
92-
# docker rmi docker-sonic-vs:$(Build.BuildNumber); \
93-
# ip netns list | grep -E [-]srv[0-9]+ | awk '{print $1}' | xargs -I {} sudo ip netns delete {}; \
94-
# sudo chown -R ${username}.${username} .; \
95-
# sudo chown -R ${username}.${username} $(System.DefaultWorkingDirectory)" EXIT
96-
# pushd platform/vs/tests
97-
# sudo py.test -v --junitxml=tr.xml --imgname=docker-sonic-vs:$(Build.BuildNumber)
98-
# displayName: "Run vs tests"
99-
# - task: PublishTestResults@2
100-
# inputs:
101-
# testResultsFiles: '**/tr.xml'
102-
# testRunTitle: vstest
103-
#
104-
# - job:
105-
# pool: sonictest
106-
# displayName: "kvmtest-t0"
107-
# timeoutInMinutes: 240
108-
#
109-
# steps:
110-
# - template: .azure-pipelines/run-test-template.yml
111-
# parameters:
112-
# dut: vlab-01
113-
# tbname: vms-kvm-t0
114-
# ptf_name: ptf_vms6-1
115-
# tbtype: t0
116-
#
117-
# - job:
118-
# pool: sonictest-t1-lag
119-
# displayName: "kvmtest-t1-lag"
120-
# timeoutInMinutes: 240
121-
#
122-
# steps:
123-
# - template: .azure-pipelines/run-test-template.yml
124-
# parameters:
125-
# dut: vlab-03
126-
# tbname: vms-kvm-t1-lag
127-
# ptf_name: ptf_vms6-2
128-
# tbtype: t1-lag
50+
# when fixed, we can remove condition key word
51+
- stage: Test
52+
condition: false
53+
variables:
54+
- name: inventory
55+
value: veos_vtb
56+
- name: testbed_file
57+
value: vtestbed.csv
58+
59+
jobs:
60+
- job:
61+
pool: sonictest
62+
displayName: "vstest"
63+
timeoutInMinutes: 60
64+
steps:
65+
- checkout: self
66+
clean: true
67+
submodules: recursive
68+
displayName: 'Checkout code'
69+
70+
- task: DownloadPipelineArtifact@2
71+
inputs:
72+
source: specific
73+
project: build
74+
pipeline: 9
75+
artifacts: sonic-swss-common.amd64.ubuntu20_04
76+
runVersion: 'latestFromBranch'
77+
runBranch: 'refs/heads/master'
78+
displayName: "Download sonic swss common deb packages"
79+
80+
- task: DownloadPipelineArtifact@2
81+
inputs:
82+
artifact: sonic-buildimage.vs
83+
displayName: "Download sonic-buildimage.vs artifact"
84+
85+
- script: |
86+
set -x
87+
sudo dpkg -i --force-confask,confnew ../sonic-swss-common.amd64.ubuntu20_04/libswsscommon_1.0.0_amd64.deb
88+
sudo dpkg -i ../sonic-swss-common.amd64.ubuntu20_04/python3-swsscommon_1.0.0_amd64.deb
89+
sudo docker load -i ../target/docker-sonic-vs.gz
90+
docker tag docker-sonic-vs:latest docker-sonic-vs:$(Build.BuildNumber)
91+
username=$(id -un)
92+
trap "docker ps; docker images; ip netns list; \
93+
docker rmi docker-sonic-vs:$(Build.BuildNumber); \
94+
ip netns list | grep -E [-]srv[0-9]+ | awk '{print $1}' | xargs -I {} sudo ip netns delete {}; \
95+
sudo chown -R ${username}.${username} .; \
96+
sudo chown -R ${username}.${username} $(System.DefaultWorkingDirectory)" EXIT
97+
pushd platform/vs/tests
98+
sudo py.test -v --junitxml=tr.xml --imgname=docker-sonic-vs:$(Build.BuildNumber)
99+
displayName: "Run vs tests"
100+
- task: PublishTestResults@2
101+
inputs:
102+
testResultsFiles: '**/tr.xml'
103+
testRunTitle: vstest
104+
105+
- job:
106+
pool: sonictest
107+
displayName: "kvmtest-t0"
108+
timeoutInMinutes: 240
109+
110+
steps:
111+
- template: .azure-pipelines/run-test-template.yml
112+
parameters:
113+
dut: vlab-01
114+
tbname: vms-kvm-t0
115+
ptf_name: ptf_vms6-1
116+
tbtype: t0
117+
118+
- job:
119+
pool: sonictest-t1-lag
120+
displayName: "kvmtest-t1-lag"
121+
timeoutInMinutes: 240
122+
123+
steps:
124+
- template: .azure-pipelines/run-test-template.yml
125+
parameters:
126+
dut: vlab-03
127+
tbname: vms-kvm-t1-lag
128+
ptf_name: ptf_vms6-2
129+
tbtype: t1-lag

0 commit comments

Comments
 (0)