From faa26dbf0c920d615a023d84264ff25acf26eb18 Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Fri, 5 Nov 2021 01:07:20 +0800
Subject: [PATCH] Fix random failure in PR/CI build. (#2006)

*step to clean work space, to avoid random failure in azure pipeline.
---
 .azure-pipelines/build-template.yml | 12 +++++++++---
 azure-pipelines.yml                 |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
index 2dbec2ffc795..b708e945a0ec 100644
--- a/.azure-pipelines/build-template.yml
+++ b/.azure-pipelines/build-template.yml
@@ -26,7 +26,6 @@ parameters:
 
 - name: buildimage_pipeline
   type: number
-  default: 1
 
 - name: sairedis_artifact_name
   type: string
@@ -56,6 +55,9 @@ jobs:
     image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:latest
 
   steps:
+  - checkout: self
+    clean: true
+    submodules: true
   - script: |
       sudo apt-get install -y libhiredis0.14 libhiredis-dev
       sudo apt-get install -y libzmq5 libzmq3-dev
@@ -75,6 +77,7 @@ jobs:
       artifact: ${{ parameters.swss_common_artifact_name }}
       runVersion: 'latestFromBranch'
       runBranch: 'refs/heads/master'
+      path: '$(Build.SourcesDirectory)/${{ parameters.swss_common_artifact_name }}'
     displayName: "Download sonic swss common deb packages"
   - task: DownloadPipelineArtifact@2
     inputs:
@@ -84,6 +87,7 @@ jobs:
       artifact: ${{ parameters.sairedis_artifact_name }}
       runVersion: 'latestFromBranch'
       runBranch: 'refs/heads/master'
+      path: '$(Build.SourcesDirectory)/${{ parameters.sairedis_artifact_name }}'
     displayName: "Download sonic sairedis deb packages"
   - task: DownloadPipelineArtifact@2
     inputs:
@@ -93,8 +97,10 @@ jobs:
       artifact: ${{ parameters.buildimage_artifact_name }}
       runVersion: 'latestFromBranch'
       runBranch: 'refs/heads/master'
+      path: '$(Build.SourcesDirectory)/${{ parameters.buildimage_artifact_name }}'
     displayName: "Download sonic buildimage deb packages"
   - script: |
+      cd $(Build.SourcesDirectory)/${{ parameters.buildimage_artifact_name }}
       sudo dpkg -i target/debs/buster/libnl-3-200_*.deb
       sudo dpkg -i target/debs/buster/libnl-3-dev_*.deb
       sudo dpkg -i target/debs/buster/libnl-genl-3-200_*.deb
@@ -103,8 +109,10 @@ jobs:
       sudo dpkg -i target/debs/buster/libnl-route-3-dev_*.deb
       sudo dpkg -i target/debs/buster/libnl-nf-3-200_*.deb
       sudo dpkg -i target/debs/buster/libnl-nf-3-dev_*.deb
+      cd $(Build.SourcesDirectory)/${{ parameters.swss_common_artifact_name }}
       sudo dpkg -i libswsscommon_1.0.0_${{ parameters.arch }}.deb
       sudo dpkg -i libswsscommon-dev_1.0.0_${{ parameters.arch }}.deb
+      cd $(Build.SourcesDirectory)/${{ parameters.sairedis_artifact_name }}
       sudo dpkg -i libsaivs_*.deb
       sudo dpkg -i libsaivs-dev_*.deb
       sudo dpkg -i libsairedis_*.deb
@@ -114,8 +122,6 @@ jobs:
       sudo dpkg -i syncd-vs_*.deb
     workingDirectory: $(Pipeline.Workspace)
     displayName: "Install libnl3, sonic swss common and sairedis"
-  - checkout: self
-    submodules: true
   - script: |
       set -x
       tar czf pytest.tgz tests
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d43520b2a7c1..52a7010ae823 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,7 +17,7 @@ stages:
       arch: amd64
       sonic_slave: sonic-slave-buster
       buildimage_artifact_name: sonic-buildimage.vs
-      buildimage_pipeline: 1
+      buildimage_pipeline: 142
       swss_common_artifact_name: sonic-swss-common
       sairedis_artifact_name: sonic-sairedis
       artifact_name: sonic-swss