From 7ec41672ea0287ec3da4cd7fd46ea7f1876651eb Mon Sep 17 00:00:00 2001
From: Prince Sunny <prince.sunny@microsoft.com>
Date: Mon, 29 Aug 2022 08:28:13 -0700
Subject: [PATCH] Revert "[ci][asan] add DVS tests run with ASAN (#2363)"

This reverts commit ca9edcadb2005a666bf8ba6f804a1565efb0f6f6.
---
 .../build-docker-sonic-vs-template.yml        | 21 +++-------
 .azure-pipelines/build-template.yml           |  7 ----
 .azure-pipelines/docker-sonic-vs/Dockerfile   |  2 -
 .../test-docker-sonic-vs-template.yml         | 41 +++----------------
 azure-pipelines.yml                           | 37 -----------------
 5 files changed, 11 insertions(+), 97 deletions(-)

diff --git a/.azure-pipelines/build-docker-sonic-vs-template.yml b/.azure-pipelines/build-docker-sonic-vs-template.yml
index 602af8a320..ff0ff6c0cb 100644
--- a/.azure-pipelines/build-docker-sonic-vs-template.yml
+++ b/.azure-pipelines/build-docker-sonic-vs-template.yml
@@ -23,10 +23,6 @@ parameters:
 - name: artifact_name
   type: string
 
-- name: asan
-  type: boolean
-  default: false
-
 jobs:
 - job:
   displayName: ${{ parameters.arch }}
@@ -70,13 +66,13 @@ jobs:
       runVersion: 'latestFromBranch'
       runBranch: 'refs/heads/$(BUILD_BRANCH)'
       path: $(Build.ArtifactStagingDirectory)/download
-      patterns: '**/target/${{ parameters.artifact_name }}.gz'
-    displayName: "Download sonic-buildimage ${{ parameters.artifact_name }}"
+      patterns: '**/target/docker-sonic-vs.gz'
+    displayName: "Download sonic-buildimage docker-sonic-vs"
   - script: |
       set -ex
       echo $(Build.DefinitionName).$(Build.BuildNumber)
 
-      docker load < $(Build.ArtifactStagingDirectory)/download/target/${{ parameters.artifact_name }}.gz
+      docker load < $(Build.ArtifactStagingDirectory)/download/target/docker-sonic-vs.gz
 
       mkdir -p .azure-pipelines/docker-sonic-vs/debs
 
@@ -84,18 +80,13 @@ jobs:
 
       pushd .azure-pipelines
 
-      build_args=""
-      if [ '${{ parameters.asan }}' == True ]; then
-        build_args="--build-arg need_dbg=y"
-      fi
-
-      docker build $build_args --no-cache -t docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber).asan-${{ parameters.asan }} docker-sonic-vs
+      docker build --no-cache -t docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber) docker-sonic-vs
 
       popd
 
-      docker save docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber).asan-${{ parameters.asan }} | gzip -c > $(Build.ArtifactStagingDirectory)/docker-sonic-vs.gz
+      docker save docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber) | gzip -c > $(Build.ArtifactStagingDirectory)/docker-sonic-vs.gz
       rm -rf $(Build.ArtifactStagingDirectory)/download
-    displayName: "Build ${{ parameters.artifact_name }}"
+    displayName: "Build docker-sonic-vs"
   - publish: $(Build.ArtifactStagingDirectory)/
     artifact: ${{ parameters.artifact_name }}
     displayName: "Archive sonic docker vs image"
diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
index b3719c341e..f8040bca56 100644
--- a/.azure-pipelines/build-template.yml
+++ b/.azure-pipelines/build-template.yml
@@ -43,10 +43,6 @@ parameters:
 - name: common_lib_artifact_name
   type: string
 
-- name: asan
-  type: boolean
-  default: false
-
 jobs:
 - job:
   displayName: ${{ parameters.arch }}
@@ -142,9 +138,6 @@ jobs:
       if [ '${{ parameters.archive_gcov }}' == True ]; then
          export ENABLE_GCOV=y
       fi
-      if [ '${{ parameters.asan }}' == True ]; then
-         export ENABLE_ASAN=y
-      fi
       ./autogen.sh
       dpkg-buildpackage -us -uc -b -j$(nproc) && cp ../*.deb .
     displayName: "Compile sonic swss"
diff --git a/.azure-pipelines/docker-sonic-vs/Dockerfile b/.azure-pipelines/docker-sonic-vs/Dockerfile
index 91fff494a1..935dec1386 100644
--- a/.azure-pipelines/docker-sonic-vs/Dockerfile
+++ b/.azure-pipelines/docker-sonic-vs/Dockerfile
@@ -1,7 +1,6 @@
 FROM docker-sonic-vs
 
 ARG docker_container_name
-ARG need_dbg
 
 ADD ["debs", "/debs"]
 
@@ -19,7 +18,6 @@ RUN dpkg -i /debs/syncd-vs_1.0.0_amd64.deb
 
 RUN dpkg --purge swss
 RUN dpkg -i /debs/swss_1.0.0_amd64.deb
-RUN if [ "$need_dbg" = "y" ] ; then dpkg -i /debs/swss-dbg_1.0.0_amd64.deb ; fi
 
 RUN apt-get update
 
diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml
index 717488faea..2dc8e3c567 100644
--- a/.azure-pipelines/test-docker-sonic-vs-template.yml
+++ b/.azure-pipelines/test-docker-sonic-vs-template.yml
@@ -16,14 +16,6 @@ parameters:
   type: boolean
   default: false
 
-- name: docker_sonic_vs_name
-  type: string
-  default: docker-sonic-vs
-
-- name: asan
-  type: boolean
-  default: false
-
 jobs:
 - job:
   displayName: vstest
@@ -38,9 +30,9 @@ jobs:
   - checkout: self
   - task: DownloadPipelineArtifact@2
     inputs:
-      artifact: ${{ parameters.docker_sonic_vs_name }}
+      artifact: docker-sonic-vs
       path: $(Build.ArtifactStagingDirectory)/download
-    displayName: "Download pre-stage built ${{ parameters.docker_sonic_vs_name }}"
+    displayName: "Download pre-stage built docker-sonic-vs"
   - task: DownloadPipelineArtifact@2
     inputs:
       source: specific
@@ -85,7 +77,7 @@ jobs:
           test_set+=("${test}")
           if [ ${#test_set[@]} -ge 20 ]; then
             test_name=$(echo "${test_set[0]}" | cut -d "." -f 1)
-            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 }}
+            echo "${test_set[*]}" | xargs sudo py.test -v --force-flaky --junitxml="${test_name}_tr.xml" --keeptb --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber)
             container_count=$(docker ps -q -a | wc -l)
             if [ ${container_count} -gt 0 ]; then
               ./gcov_support.sh set_environment $(Build.ArtifactStagingDirectory)
@@ -97,7 +89,7 @@ jobs:
         done
         if [ ${#test_set[@]} -gt 0 ]; then
           test_name=$(echo "${test_set[0]}" | cut -d "." -f 1)
-          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 }}
+          echo "${test_set[*]}" | xargs sudo py.test -v --force-flaky --junitxml="${test_name}_tr.xml" --keeptb --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber)
           container_count=$(docker ps -q -a | wc -l)
           if [ ${container_count} -gt 0 ]; then
             ./gcov_support.sh set_environment $(Build.ArtifactStagingDirectory)
@@ -106,13 +98,8 @@ jobs:
           fi
         fi
       else
-        test_args=""
-        if [ '${{ parameters.asan }}' == True ]; then
-          test_args="--graceful-stop"
-        fi
-        sudo py.test $test_args -v --force-flaky --junitxml=tests_tr.xml --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber).asan-${{ parameters.asan }}
+        sudo py.test -v --force-flaky --junitxml=tests_tr.xml --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber)
       fi
-
       rm -rf $(Build.ArtifactStagingDirectory)/download
     displayName: "Run vs tests"
 
@@ -125,10 +112,6 @@ jobs:
   - script: |
       cp -r tests/log $(Build.ArtifactStagingDirectory)/
 
-      if [ '${{ parameters.asan }}' == True ]; then
-        cp -r tests/log/*/log/asan $(Build.ArtifactStagingDirectory)/
-      fi
-
       if [ '${{ parameters.archive_gcov }}' == True ]; then
         sudo apt-get install -y lcov
         cd $(Build.ArtifactStagingDirectory)/gcov_tmp/
@@ -147,17 +130,3 @@ jobs:
     artifact: ${{ parameters.log_artifact_name }}@$(System.JobAttempt)
     displayName: "Publish logs"
     condition: always()
-
-  - publish: $(Build.ArtifactStagingDirectory)/asan
-    artifact: asan-reports
-    displayName: "Publish ASAN reports"
-    condition: eq('${{ parameters.asan }}', true)
-
-  - script: |
-      if [ "$(ls -A $(Build.ArtifactStagingDirectory)/asan)" ]; then
-        echo "There are issues reported by ASAN"
-      else
-        echo "No issues reported by ASAN"
-      fi
-    displayName: "Check ASAN reports"
-    condition: eq('${{ parameters.asan }}', true)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7311c73d09..166905654e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -49,19 +49,6 @@ stages:
       archive_pytests: true
       archive_gcov: true
 
-- stage: BuildAsan
-
-  jobs:
-  - template: .azure-pipelines/build-template.yml
-    parameters:
-      arch: amd64
-      sonic_slave: sonic-slave-buster
-      common_lib_artifact_name: common-lib
-      swss_common_artifact_name: sonic-swss-common
-      sairedis_artifact_name: sonic-sairedis
-      artifact_name: sonic-swss-asan
-      asan: true
-
 - stage: BuildArm
   dependsOn: Build
   condition: succeeded('Build')
@@ -101,18 +88,6 @@ stages:
       swss_artifact_name: sonic-swss
       artifact_name: docker-sonic-vs
 
-- stage: BuildDockerAsan
-  dependsOn: BuildAsan
-  condition: succeeded('BuildAsan')
-  jobs:
-  - template: .azure-pipelines/build-docker-sonic-vs-template.yml
-    parameters:
-      swss_common_artifact_name: sonic-swss-common
-      sairedis_artifact_name: sonic-sairedis
-      swss_artifact_name: sonic-swss-asan
-      artifact_name: docker-sonic-vs-asan
-      asan: true
-
 - stage: Test
   dependsOn: BuildDocker
   condition: succeeded('BuildDocker')
@@ -124,18 +99,6 @@ stages:
       sonic_slave: sonic-slave-buster
       archive_gcov: true
 
-- stage: TestAsan
-  dependsOn: BuildDockerAsan
-  condition: succeeded('BuildDockerAsan')
-  jobs:
-  - template: .azure-pipelines/test-docker-sonic-vs-template.yml
-    parameters:
-      log_artifact_name: log-asan
-      gcov_artifact_name: sonic-gcov
-      sonic_slave: sonic-slave-buster
-      docker_sonic_vs_name: docker-sonic-vs-asan
-      asan: true
-
 - stage: Gcov
   dependsOn: Test
   condition: always()