Skip to content

Commit 7ec4167

Browse files
prsunnyprsunny
authored
Revert "[ci][asan] add DVS tests run with ASAN (#2363)"
This reverts commit ca9edca.
1 parent a26b26a commit 7ec4167

File tree

5 files changed

+11
-97
lines changed

5 files changed

+11
-97
lines changed

‎.azure-pipelines/build-docker-sonic-vs-template.yml

+6-15
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ parameters:
2323
- name: artifact_name
2424
type: string
2525

26-
- name: asan
27-
type: boolean
28-
default: false
29-
3026
jobs:
3127
- job:
3228
displayName: ${{ parameters.arch }}
@@ -70,32 +66,27 @@ jobs:
7066
runVersion: 'latestFromBranch'
7167
runBranch: 'refs/heads/$(BUILD_BRANCH)'
7268
path: $(Build.ArtifactStagingDirectory)/download
73-
patterns: '**/target/${{ parameters.artifact_name }}.gz'
74-
displayName: "Download sonic-buildimage ${{ parameters.artifact_name }}"
69+
patterns: '**/target/docker-sonic-vs.gz'
70+
displayName: "Download sonic-buildimage docker-sonic-vs"
7571
- script: |
7672
set -ex
7773
echo $(Build.DefinitionName).$(Build.BuildNumber)
7874
79-
docker load < $(Build.ArtifactStagingDirectory)/download/target/${{ parameters.artifact_name }}.gz
75+
docker load < $(Build.ArtifactStagingDirectory)/download/target/docker-sonic-vs.gz
8076
8177
mkdir -p .azure-pipelines/docker-sonic-vs/debs
8278
8379
cp -v $(Build.ArtifactStagingDirectory)/download/*.deb .azure-pipelines/docker-sonic-vs/debs
8480
8581
pushd .azure-pipelines
8682
87-
build_args=""
88-
if [ '${{ parameters.asan }}' == True ]; then
89-
build_args="--build-arg need_dbg=y"
90-
fi
91-
92-
docker build $build_args --no-cache -t docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber).asan-${{ parameters.asan }} docker-sonic-vs
83+
docker build --no-cache -t docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber) docker-sonic-vs
9384
9485
popd
9586
96-
docker save docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber).asan-${{ parameters.asan }} | gzip -c > $(Build.ArtifactStagingDirectory)/docker-sonic-vs.gz
87+
docker save docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber) | gzip -c > $(Build.ArtifactStagingDirectory)/docker-sonic-vs.gz
9788
rm -rf $(Build.ArtifactStagingDirectory)/download
98-
displayName: "Build ${{ parameters.artifact_name }}"
89+
displayName: "Build docker-sonic-vs"
9990
- publish: $(Build.ArtifactStagingDirectory)/
10091
artifact: ${{ parameters.artifact_name }}
10192
displayName: "Archive sonic docker vs image"

‎.azure-pipelines/build-template.yml

-7
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ parameters:
4343
- name: common_lib_artifact_name
4444
type: string
4545

46-
- name: asan
47-
type: boolean
48-
default: false
49-
5046
jobs:
5147
- job:
5248
displayName: ${{ parameters.arch }}
@@ -142,9 +138,6 @@ jobs:
142138
if [ '${{ parameters.archive_gcov }}' == True ]; then
143139
export ENABLE_GCOV=y
144140
fi
145-
if [ '${{ parameters.asan }}' == True ]; then
146-
export ENABLE_ASAN=y
147-
fi
148141
./autogen.sh
149142
dpkg-buildpackage -us -uc -b -j$(nproc) && cp ../*.deb .
150143
displayName: "Compile sonic swss"

‎.azure-pipelines/docker-sonic-vs/Dockerfile

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FROM docker-sonic-vs
22

33
ARG docker_container_name
4-
ARG need_dbg
54

65
ADD ["debs", "/debs"]
76

@@ -19,7 +18,6 @@ RUN dpkg -i /debs/syncd-vs_1.0.0_amd64.deb
1918

2019
RUN dpkg --purge swss
2120
RUN dpkg -i /debs/swss_1.0.0_amd64.deb
22-
RUN if [ "$need_dbg" = "y" ] ; then dpkg -i /debs/swss-dbg_1.0.0_amd64.deb ; fi
2321

2422
RUN apt-get update
2523

‎.azure-pipelines/test-docker-sonic-vs-template.yml

+5-36
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ parameters:
1616
type: boolean
1717
default: false
1818

19-
- name: docker_sonic_vs_name
20-
type: string
21-
default: docker-sonic-vs
22-
23-
- name: asan
24-
type: boolean
25-
default: false
26-
2719
jobs:
2820
- job:
2921
displayName: vstest
@@ -38,9 +30,9 @@ jobs:
3830
- checkout: self
3931
- task: DownloadPipelineArtifact@2
4032
inputs:
41-
artifact: ${{ parameters.docker_sonic_vs_name }}
33+
artifact: docker-sonic-vs
4234
path: $(Build.ArtifactStagingDirectory)/download
43-
displayName: "Download pre-stage built ${{ parameters.docker_sonic_vs_name }}"
35+
displayName: "Download pre-stage built docker-sonic-vs"
4436
- task: DownloadPipelineArtifact@2
4537
inputs:
4638
source: specific
@@ -85,7 +77,7 @@ jobs:
8577
test_set+=("${test}")
8678
if [ ${#test_set[@]} -ge 20 ]; then
8779
test_name=$(echo "${test_set[0]}" | cut -d "." -f 1)
88-
echo "${test_set[*]}" | xargs sudo py.test -v --force-flaky --junitxml="${test_name}_tr.xml" --keeptb --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber).asan-${{ parameters.asan }}
80+
echo "${test_set[*]}" | xargs sudo py.test -v --force-flaky --junitxml="${test_name}_tr.xml" --keeptb --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber)
8981
container_count=$(docker ps -q -a | wc -l)
9082
if [ ${container_count} -gt 0 ]; then
9183
./gcov_support.sh set_environment $(Build.ArtifactStagingDirectory)
@@ -97,7 +89,7 @@ jobs:
9789
done
9890
if [ ${#test_set[@]} -gt 0 ]; then
9991
test_name=$(echo "${test_set[0]}" | cut -d "." -f 1)
100-
echo "${test_set[*]}" | xargs sudo py.test -v --force-flaky --junitxml="${test_name}_tr.xml" --keeptb --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber).asan-${{ parameters.asan }}
92+
echo "${test_set[*]}" | xargs sudo py.test -v --force-flaky --junitxml="${test_name}_tr.xml" --keeptb --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber)
10193
container_count=$(docker ps -q -a | wc -l)
10294
if [ ${container_count} -gt 0 ]; then
10395
./gcov_support.sh set_environment $(Build.ArtifactStagingDirectory)
@@ -106,13 +98,8 @@ jobs:
10698
fi
10799
fi
108100
else
109-
test_args=""
110-
if [ '${{ parameters.asan }}' == True ]; then
111-
test_args="--graceful-stop"
112-
fi
113-
sudo py.test $test_args -v --force-flaky --junitxml=tests_tr.xml --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber).asan-${{ parameters.asan }}
101+
sudo py.test -v --force-flaky --junitxml=tests_tr.xml --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber)
114102
fi
115-
116103
rm -rf $(Build.ArtifactStagingDirectory)/download
117104
displayName: "Run vs tests"
118105
@@ -125,10 +112,6 @@ jobs:
125112
- script: |
126113
cp -r tests/log $(Build.ArtifactStagingDirectory)/
127114
128-
if [ '${{ parameters.asan }}' == True ]; then
129-
cp -r tests/log/*/log/asan $(Build.ArtifactStagingDirectory)/
130-
fi
131-
132115
if [ '${{ parameters.archive_gcov }}' == True ]; then
133116
sudo apt-get install -y lcov
134117
cd $(Build.ArtifactStagingDirectory)/gcov_tmp/
@@ -147,17 +130,3 @@ jobs:
147130
artifact: ${{ parameters.log_artifact_name }}@$(System.JobAttempt)
148131
displayName: "Publish logs"
149132
condition: always()
150-
151-
- publish: $(Build.ArtifactStagingDirectory)/asan
152-
artifact: asan-reports
153-
displayName: "Publish ASAN reports"
154-
condition: eq('${{ parameters.asan }}', true)
155-
156-
- script: |
157-
if [ "$(ls -A $(Build.ArtifactStagingDirectory)/asan)" ]; then
158-
echo "There are issues reported by ASAN"
159-
else
160-
echo "No issues reported by ASAN"
161-
fi
162-
displayName: "Check ASAN reports"
163-
condition: eq('${{ parameters.asan }}', true)

‎azure-pipelines.yml

-37
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,6 @@ stages:
4949
archive_pytests: true
5050
archive_gcov: true
5151

52-
- stage: BuildAsan
53-
54-
jobs:
55-
- template: .azure-pipelines/build-template.yml
56-
parameters:
57-
arch: amd64
58-
sonic_slave: sonic-slave-buster
59-
common_lib_artifact_name: common-lib
60-
swss_common_artifact_name: sonic-swss-common
61-
sairedis_artifact_name: sonic-sairedis
62-
artifact_name: sonic-swss-asan
63-
asan: true
64-
6552
- stage: BuildArm
6653
dependsOn: Build
6754
condition: succeeded('Build')
@@ -101,18 +88,6 @@ stages:
10188
swss_artifact_name: sonic-swss
10289
artifact_name: docker-sonic-vs
10390

104-
- stage: BuildDockerAsan
105-
dependsOn: BuildAsan
106-
condition: succeeded('BuildAsan')
107-
jobs:
108-
- template: .azure-pipelines/build-docker-sonic-vs-template.yml
109-
parameters:
110-
swss_common_artifact_name: sonic-swss-common
111-
sairedis_artifact_name: sonic-sairedis
112-
swss_artifact_name: sonic-swss-asan
113-
artifact_name: docker-sonic-vs-asan
114-
asan: true
115-
11691
- stage: Test
11792
dependsOn: BuildDocker
11893
condition: succeeded('BuildDocker')
@@ -124,18 +99,6 @@ stages:
12499
sonic_slave: sonic-slave-buster
125100
archive_gcov: true
126101

127-
- stage: TestAsan
128-
dependsOn: BuildDockerAsan
129-
condition: succeeded('BuildDockerAsan')
130-
jobs:
131-
- template: .azure-pipelines/test-docker-sonic-vs-template.yml
132-
parameters:
133-
log_artifact_name: log-asan
134-
gcov_artifact_name: sonic-gcov
135-
sonic_slave: sonic-slave-buster
136-
docker_sonic_vs_name: docker-sonic-vs-asan
137-
asan: true
138-
139102
- stage: Gcov
140103
dependsOn: Test
141104
condition: always()

0 commit comments

Comments
 (0)