fix
This commit is contained in:
Shilong Liu
parent
28e0a61c02
commit
84f6c5d3b2
@ -47,82 +47,83 @@ stages:
|
||||
- name: broadcom
|
||||
- name: mellanox
|
||||
# TODO: test is failing now.
|
||||
# when fixed, we can uncomment it.
|
||||
#- stage: Test
|
||||
# variables:
|
||||
# - name: inventory
|
||||
# value: veos_vtb
|
||||
# - name: testbed_file
|
||||
# value: vtestbed.csv
|
||||
#
|
||||
# jobs:
|
||||
# - job:
|
||||
# pool: sonictest
|
||||
# displayName: "vstest"
|
||||
# timeoutInMinutes: 60
|
||||
# steps:
|
||||
# - checkout: self
|
||||
# clean: true
|
||||
# submodules: recursive
|
||||
# displayName: 'Checkout code'
|
||||
#
|
||||
# - task: DownloadPipelineArtifact@2
|
||||
# inputs:
|
||||
# source: specific
|
||||
# project: build
|
||||
# pipeline: 9
|
||||
# artifacts: sonic-swss-common.amd64.ubuntu20_04
|
||||
# runVersion: 'latestFromBranch'
|
||||
# runBranch: 'refs/heads/master'
|
||||
# displayName: "Download sonic swss common deb packages"
|
||||
#
|
||||
# - task: DownloadPipelineArtifact@2
|
||||
# inputs:
|
||||
# artifact: sonic-buildimage.vs
|
||||
# displayName: "Download sonic-buildimage.vs artifact"
|
||||
#
|
||||
# - script: |
|
||||
# set -x
|
||||
# sudo dpkg -i --force-confask,confnew ../sonic-swss-common.amd64.ubuntu20_04/libswsscommon_1.0.0_amd64.deb
|
||||
# sudo dpkg -i ../sonic-swss-common.amd64.ubuntu20_04/python3-swsscommon_1.0.0_amd64.deb
|
||||
# sudo docker load -i ../target/docker-sonic-vs.gz
|
||||
# docker tag docker-sonic-vs:latest docker-sonic-vs:$(Build.BuildNumber)
|
||||
# username=$(id -un)
|
||||
# trap "docker ps; docker images; ip netns list; \
|
||||
# docker rmi docker-sonic-vs:$(Build.BuildNumber); \
|
||||
# ip netns list | grep -E [-]srv[0-9]+ | awk '{print $1}' | xargs -I {} sudo ip netns delete {}; \
|
||||
# sudo chown -R ${username}.${username} .; \
|
||||
# sudo chown -R ${username}.${username} $(System.DefaultWorkingDirectory)" EXIT
|
||||
# pushd platform/vs/tests
|
||||
# sudo py.test -v --junitxml=tr.xml --imgname=docker-sonic-vs:$(Build.BuildNumber)
|
||||
# displayName: "Run vs tests"
|
||||
# - task: PublishTestResults@2
|
||||
# inputs:
|
||||
# testResultsFiles: '**/tr.xml'
|
||||
# testRunTitle: vstest
|
||||
#
|
||||
# - job:
|
||||
# pool: sonictest
|
||||
# displayName: "kvmtest-t0"
|
||||
# timeoutInMinutes: 240
|
||||
#
|
||||
# steps:
|
||||
# - template: .azure-pipelines/run-test-template.yml
|
||||
# parameters:
|
||||
# dut: vlab-01
|
||||
# tbname: vms-kvm-t0
|
||||
# ptf_name: ptf_vms6-1
|
||||
# tbtype: t0
|
||||
#
|
||||
# - job:
|
||||
# pool: sonictest-t1-lag
|
||||
# displayName: "kvmtest-t1-lag"
|
||||
# timeoutInMinutes: 240
|
||||
#
|
||||
# steps:
|
||||
# - template: .azure-pipelines/run-test-template.yml
|
||||
# parameters:
|
||||
# dut: vlab-03
|
||||
# tbname: vms-kvm-t1-lag
|
||||
# ptf_name: ptf_vms6-2
|
||||
# tbtype: t1-lag
|
||||
# when fixed, we can remove condition key word
|
||||
- stage: Test
|
||||
condition: false
|
||||
variables:
|
||||
- name: inventory
|
||||
value: veos_vtb
|
||||
- name: testbed_file
|
||||
value: vtestbed.csv
|
||||
|
||||
jobs:
|
||||
- job:
|
||||
pool: sonictest
|
||||
displayName: "vstest"
|
||||
timeoutInMinutes: 60
|
||||
steps:
|
||||
- checkout: self
|
||||
clean: true
|
||||
submodules: recursive
|
||||
displayName: 'Checkout code'
|
||||
|
||||
- task: DownloadPipelineArtifact@2
|
||||
inputs:
|
||||
source: specific
|
||||
project: build
|
||||
pipeline: 9
|
||||
artifacts: sonic-swss-common.amd64.ubuntu20_04
|
||||
runVersion: 'latestFromBranch'
|
||||
runBranch: 'refs/heads/master'
|
||||
displayName: "Download sonic swss common deb packages"
|
||||
|
||||
- task: DownloadPipelineArtifact@2
|
||||
inputs:
|
||||
artifact: sonic-buildimage.vs
|
||||
displayName: "Download sonic-buildimage.vs artifact"
|
||||
|
||||
- script: |
|
||||
set -x
|
||||
sudo dpkg -i --force-confask,confnew ../sonic-swss-common.amd64.ubuntu20_04/libswsscommon_1.0.0_amd64.deb
|
||||
sudo dpkg -i ../sonic-swss-common.amd64.ubuntu20_04/python3-swsscommon_1.0.0_amd64.deb
|
||||
sudo docker load -i ../target/docker-sonic-vs.gz
|
||||
docker tag docker-sonic-vs:latest docker-sonic-vs:$(Build.BuildNumber)
|
||||
username=$(id -un)
|
||||
trap "docker ps; docker images; ip netns list; \
|
||||
docker rmi docker-sonic-vs:$(Build.BuildNumber); \
|
||||
ip netns list | grep -E [-]srv[0-9]+ | awk '{print $1}' | xargs -I {} sudo ip netns delete {}; \
|
||||
sudo chown -R ${username}.${username} .; \
|
||||
sudo chown -R ${username}.${username} $(System.DefaultWorkingDirectory)" EXIT
|
||||
pushd platform/vs/tests
|
||||
sudo py.test -v --junitxml=tr.xml --imgname=docker-sonic-vs:$(Build.BuildNumber)
|
||||
displayName: "Run vs tests"
|
||||
- task: PublishTestResults@2
|
||||
inputs:
|
||||
testResultsFiles: '**/tr.xml'
|
||||
testRunTitle: vstest
|
||||
|
||||
- job:
|
||||
pool: sonictest
|
||||
displayName: "kvmtest-t0"
|
||||
timeoutInMinutes: 240
|
||||
|
||||
steps:
|
||||
- template: .azure-pipelines/run-test-template.yml
|
||||
parameters:
|
||||
dut: vlab-01
|
||||
tbname: vms-kvm-t0
|
||||
ptf_name: ptf_vms6-1
|
||||
tbtype: t0
|
||||
|
||||
- job:
|
||||
pool: sonictest-t1-lag
|
||||
displayName: "kvmtest-t1-lag"
|
||||
timeoutInMinutes: 240
|
||||
|
||||
steps:
|
||||
- template: .azure-pipelines/run-test-template.yml
|
||||
parameters:
|
||||
dut: vlab-03
|
||||
tbname: vms-kvm-t1-lag
|
||||
ptf_name: ptf_vms6-2
|
||||
tbtype: t1-lag
|
||||
|
||||
Reference in New Issue
Block a user