From c8e98e3b1933624eb550191e625947e394681d7b Mon Sep 17 00:00:00 2001
From: Yue Gao <yuega2@cisco.com>
Date: Fri, 31 Jan 2025 14:13:59 -0800
Subject: [PATCH 01/12] Build sonic-vpp image in azure-pipeline

---
 azure-pipelines.yml | 101 ++++++++++++++++++++++++--------------------
 vppbld/Makefile     |  13 +++++-
 2 files changed, 67 insertions(+), 47 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 23e3bf9..b1c2afe 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -12,8 +12,7 @@ trigger:
     include:
     - main
 
-pool: 
-  vmImage: ubuntu-20.04
+pool: sonicbld-1es
 
 schedules:
 - cron: "0 8 * * *"
@@ -23,6 +22,19 @@ schedules:
     - main
   always: true
 
+resources:
+  repositories:
+  - repository: sonic-platform-vpp
+    type: github
+    name: sonic-net/sonic-platform-vpp
+    ref: master
+    endpoint: sonic-net
+  - repository: buildimage
+    type: github
+    name: sonic-net/sonic-buildimage
+    endpoint: sonic-net
+    ref: master
+
 parameters:
   - name: debian_version
     type: string
@@ -38,13 +50,33 @@ variables:
     ${{ else }}:
       value: $(Build.SourceBranchName)
   - name: SONIC_BRANCH
-    ${{ if eq(variables['BUILD_BRANCH'], 'main') }}:
-      value: master
-    ${{ else }}:
-      value: $(BUILD_BRANCH)
+    value: master
+  - name: CACHE_OPTIONS
+    value: SONIC_DPKG_CACHE_METHOD=cache SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/vpp
+  - name: BUILD_OPTIONS
+    value: ENABLE_DOCKER_BASE_PULL=y USERNAME=admin SONIC_BUILD_JOBS=$(nproc) PLATFORM=vpp SONIC_VERSION_CONTROL_COMPONENTS=py2,py3,web,git,docker
 stages:
+- stage: prestage
+  jobs:
+  - job:
+    timeoutInMinutes: 30
+    steps:
+    - checkout: buildimage
+      submodules: recursive
+      fetchDepth: 0
+      clean: true
+      displayName: 'checkout sonic-buildimage'
+    - script: |
+      set -ex
+      git checkout $(SONIC_BRANCH)
+      make init
+      rm -rf platform/vpp
+    - checkout: self
+      path: platform/vpp
+      displayName: 'checkout sonic-platform-vpp'
+    - script: |
+      $(BUILD_OPTIONS) $(CACHE_OPTIONS) make configure PLATFORM=vpp
 - stage: BuildVpp
-  
   jobs:
   - job:
     displayName: amd64
@@ -53,46 +85,23 @@ stages:
       image: sonicdev-microsoft.azurecr.io:443/sonic-slave-${{ parameters.debian_version }}:latest
       options:  "--privileged"
     steps:
-    - checkout: self
-      clean: true
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        source: specific
-        project: build
-        pipeline: Azure.sonic-buildimage.common_libs
-        runVersion: 'latestFromBranch'
-        runBranch: 'refs/heads/master'
-        path: $(Build.ArtifactStagingDirectory)/download
-        artifact: common-lib
-        patterns: |
-            target/debs/${{ parameters.debian_version }}/libnl-3*.deb
-            target/debs/${{ parameters.debian_version }}/libnl-genl*.deb
-            target/debs/${{ parameters.debian_version }}/libnl-route*.deb
-            target/debs/${{ parameters.debian_version }}/libnl-nf*.deb
-      displayName: "Download common libs"
-    - script: |
-        set -ex
-        echo "SONIC_BRANCH: $(SONIC_BRANCH), BUILD_BRANCH: $(BUILD_BRANCH)"
-        # install libyang before install libswsscommon
-        sudo dpkg -i $(find ./download -name *.deb)
-        rm -rf download || true
-        cat /etc/apt/sources.list
-        dpkg --list |grep libnl
-      workingDirectory: $(Build.ArtifactStagingDirectory)
-      displayName: "Install libnl3"
     - script: |
-        set -ex
-        git clone https://github.com/sonic-net/sonic-platform-vpp.git
-        mkdir repo
-        git clone https://gerrit.fd.io/r/vpp repo
-        cp -vr sonic-platform-vpp/vppbld/plugins/* repo/src/packages
-        cd repo
-        git apply ../sonic-platform-vpp/vppbld/vpp.patch
-        make UNATTENDED=y PLATFORM=vpp install-deps install-ext-deps
-        make UNATTENDED=y PLATFORM=vpp -j4 pkg-deb
-        mkdir artifacts
-        mv build-root/*.deb artifacts/
+      $(BUILD_OPTIONS) $(CACHE_OPTIONS) make target/debs/${{ parameters.debian_version }}/libvppinfra_main-release_amd64.deb
+      find target/debs/${{ parameters.debian_version }}/ -name "*vpp*.deb" -exec cp {} /$(System.DefaultWorkingDirectory)/artifacts \; 
       displayName: "Build VPP packages from source"
-    - publish: $(System.DefaultWorkingDirectory)/repo/artifacts
+    - publish: $(System.DefaultWorkingDirectory)/artifacts
       artifact: vpp
       displayName: "Archive vpp debian packages"
+- stage: BuildSonicVpp
+  jobs:
+  - job:
+    displayName: amd64
+    timeoutInMinutes: 300
+    steps:
+    - script: |
+       $(BUILD_OPTIONS) $(CACHE_OPTIONS) make target/sonic-vpp.img.gz
+      displayName: "Build sonic-vpp image"
+    - publish: $(System.DefaultWorkingDirectory)/target/sonic-vpp.img.gz
+      artifact: sonic-vpp
+      displayName: "Archive sonic-vpp image"
+
diff --git a/vppbld/Makefile b/vppbld/Makefile
index 5def200..6001d18 100644
--- a/vppbld/Makefile
+++ b/vppbld/Makefile
@@ -83,8 +83,19 @@ vppbld-docker/Dockerfile-$(BLDENV): vppbld-docker/Dockerfile-$(BLDENV).j2
 	export VPP_DOCKER_DEBS="$(VPP_DOCKER_DEBS)"
 	j2 vppbld-docker/Dockerfile-$(BLDENV).j2 > vppbld-docker/Dockerfile-$(BLDENV)
 
+DOCKER_CHECK := $(shell docker info >/dev/null 2>&1 && echo running || echo stopped)
+.PHONY: start-docker
+start-docker:
+ifeq ($(DOCKER_CHECK), stopped)
+	@echo "Docker is not running. Starting Docker daemon..."
+	@sudo -E dockerd > /dev/null 2>&1 &
+	@sleep 5  # Wait for Docker to start
+else
+	@echo "Docker is already running."
+endif
+
 .PHONY: docker_build
-docker_build:  vppbld-docker/Dockerfile-$(BLDENV)
+docker_build:  vppbld-docker/Dockerfile-$(BLDENV) start-docker
 	pushd vppbld-docker
 	rm -rf debs
 	mkdir debs

From 6602bf2c59edb094889b68f0dcc79dc15e33f94e Mon Sep 17 00:00:00 2001
From: Yue Gao <yuega2@cisco.com>
Date: Fri, 31 Jan 2025 14:20:11 -0800
Subject: [PATCH 02/12] Fix indentation

---
 azure-pipelines.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b1c2afe..f094c81 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -67,15 +67,15 @@ stages:
       clean: true
       displayName: 'checkout sonic-buildimage'
     - script: |
-      set -ex
-      git checkout $(SONIC_BRANCH)
-      make init
-      rm -rf platform/vpp
+        set -ex
+        git checkout $(SONIC_BRANCH)
+        make init
+        rm -rf platform/vpp
     - checkout: self
       path: platform/vpp
       displayName: 'checkout sonic-platform-vpp'
     - script: |
-      $(BUILD_OPTIONS) $(CACHE_OPTIONS) make configure PLATFORM=vpp
+        $(BUILD_OPTIONS) $(CACHE_OPTIONS) make configure PLATFORM=vpp
 - stage: BuildVpp
   jobs:
   - job:
@@ -86,8 +86,8 @@ stages:
       options:  "--privileged"
     steps:
     - script: |
-      $(BUILD_OPTIONS) $(CACHE_OPTIONS) make target/debs/${{ parameters.debian_version }}/libvppinfra_main-release_amd64.deb
-      find target/debs/${{ parameters.debian_version }}/ -name "*vpp*.deb" -exec cp {} /$(System.DefaultWorkingDirectory)/artifacts \; 
+        $(BUILD_OPTIONS) $(CACHE_OPTIONS) make target/debs/${{ parameters.debian_version }}/libvppinfra_main-release_amd64.deb
+        find target/debs/${{ parameters.debian_version }}/ -name "*vpp*.deb" -exec cp {} /$(System.DefaultWorkingDirectory)/artifacts \; 
       displayName: "Build VPP packages from source"
     - publish: $(System.DefaultWorkingDirectory)/artifacts
       artifact: vpp
@@ -99,7 +99,7 @@ stages:
     timeoutInMinutes: 300
     steps:
     - script: |
-       $(BUILD_OPTIONS) $(CACHE_OPTIONS) make target/sonic-vpp.img.gz
+        $(BUILD_OPTIONS) $(CACHE_OPTIONS) make target/sonic-vpp.img.gz
       displayName: "Build sonic-vpp image"
     - publish: $(System.DefaultWorkingDirectory)/target/sonic-vpp.img.gz
       artifact: sonic-vpp

From c8c5ff4814851aecef48ab20e1741a5f000d5482 Mon Sep 17 00:00:00 2001
From: Yue Gao <yuega2@cisco.com>
Date: Fri, 31 Jan 2025 14:21:45 -0800
Subject: [PATCH 03/12] Fix vpp branch

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f094c81..8e1c3e3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -27,7 +27,7 @@ resources:
   - repository: sonic-platform-vpp
     type: github
     name: sonic-net/sonic-platform-vpp
-    ref: master
+    ref: main
     endpoint: sonic-net
   - repository: buildimage
     type: github

From 2ffb888c6323c3e7dd22ced4a0f0190244c29ebf Mon Sep 17 00:00:00 2001
From: Yue Gao <yuega2@cisco.com>
Date: Mon, 3 Feb 2025 06:27:00 -0800
Subject: [PATCH 04/12] Set working directory

---
 azure-pipelines.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8e1c3e3..e8b7556 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -71,11 +71,14 @@ stages:
         git checkout $(SONIC_BRANCH)
         make init
         rm -rf platform/vpp
+      workingDirectory: $(System.DefaultWorkingDirectory)/sonic-buildimage
     - checkout: self
-      path: platform/vpp
+      path: sonic-buildimage/platform/vpp
       displayName: 'checkout sonic-platform-vpp'
     - script: |
         $(BUILD_OPTIONS) $(CACHE_OPTIONS) make configure PLATFORM=vpp
+      workingDirectory: $(System.DefaultWorkingDirectory)/sonic-buildimage
+      displayName: 'make configure'
 - stage: BuildVpp
   jobs:
   - job:
@@ -88,6 +91,7 @@ stages:
     - script: |
         $(BUILD_OPTIONS) $(CACHE_OPTIONS) make target/debs/${{ parameters.debian_version }}/libvppinfra_main-release_amd64.deb
         find target/debs/${{ parameters.debian_version }}/ -name "*vpp*.deb" -exec cp {} /$(System.DefaultWorkingDirectory)/artifacts \; 
+      workingDirectory: $(System.DefaultWorkingDirectory)/sonic-buildimage
       displayName: "Build VPP packages from source"
     - publish: $(System.DefaultWorkingDirectory)/artifacts
       artifact: vpp
@@ -100,6 +104,7 @@ stages:
     steps:
     - script: |
         $(BUILD_OPTIONS) $(CACHE_OPTIONS) make target/sonic-vpp.img.gz
+      workingDirectory: $(System.DefaultWorkingDirectory)/sonic-buildimage
       displayName: "Build sonic-vpp image"
     - publish: $(System.DefaultWorkingDirectory)/target/sonic-vpp.img.gz
       artifact: sonic-vpp

From 837fdbb8abcd812d262f4c9f89a357be0b4b7bed Mon Sep 17 00:00:00 2001
From: Yue Gao <yuega2@cisco.com>
Date: Mon, 3 Feb 2025 06:58:41 -0800
Subject: [PATCH 05/12] Move jobs to the same stage

---
 azure-pipelines.yml | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e8b7556..689c96a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -56,10 +56,10 @@ variables:
   - name: BUILD_OPTIONS
     value: ENABLE_DOCKER_BASE_PULL=y USERNAME=admin SONIC_BUILD_JOBS=$(nproc) PLATFORM=vpp SONIC_VERSION_CONTROL_COMPONENTS=py2,py3,web,git,docker
 stages:
-- stage: prestage
+- stage: build
   jobs:
   - job:
-    timeoutInMinutes: 30
+    timeoutInMinutes: 450
     steps:
     - checkout: buildimage
       submodules: recursive
@@ -75,19 +75,15 @@ stages:
     - checkout: self
       path: sonic-buildimage/platform/vpp
       displayName: 'checkout sonic-platform-vpp'
+    - script: |
+        set -ex
+        git revert 67edf2f39c -n
+      workingDirectory: $(System.DefaultWorkingDirectory)/sonic-buildimage/platform/vpp
+      displayName: 'revert 67edf2f39c'
     - script: |
         $(BUILD_OPTIONS) $(CACHE_OPTIONS) make configure PLATFORM=vpp
       workingDirectory: $(System.DefaultWorkingDirectory)/sonic-buildimage
       displayName: 'make configure'
-- stage: BuildVpp
-  jobs:
-  - job:
-    displayName: amd64
-    timeoutInMinutes: 300
-    container:
-      image: sonicdev-microsoft.azurecr.io:443/sonic-slave-${{ parameters.debian_version }}:latest
-      options:  "--privileged"
-    steps:
     - script: |
         $(BUILD_OPTIONS) $(CACHE_OPTIONS) make target/debs/${{ parameters.debian_version }}/libvppinfra_main-release_amd64.deb
         find target/debs/${{ parameters.debian_version }}/ -name "*vpp*.deb" -exec cp {} /$(System.DefaultWorkingDirectory)/artifacts \; 
@@ -96,12 +92,6 @@ stages:
     - publish: $(System.DefaultWorkingDirectory)/artifacts
       artifact: vpp
       displayName: "Archive vpp debian packages"
-- stage: BuildSonicVpp
-  jobs:
-  - job:
-    displayName: amd64
-    timeoutInMinutes: 300
-    steps:
     - script: |
         $(BUILD_OPTIONS) $(CACHE_OPTIONS) make target/sonic-vpp.img.gz
       workingDirectory: $(System.DefaultWorkingDirectory)/sonic-buildimage

From 61a16dd663c05d6f45e77d04ffb4265fdac69904 Mon Sep 17 00:00:00 2001
From: Yue Gao <yuega2@cisco.com>
Date: Mon, 3 Feb 2025 07:39:29 -0800
Subject: [PATCH 06/12] Set checkout path of sonic-platform-vpp

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 689c96a..227fa54 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -73,7 +73,7 @@ stages:
         rm -rf platform/vpp
       workingDirectory: $(System.DefaultWorkingDirectory)/sonic-buildimage
     - checkout: self
-      path: sonic-buildimage/platform/vpp
+      path: $(System.DefaultWorkingDirectory)/sonic-buildimage/platform/vpp
       displayName: 'checkout sonic-platform-vpp'
     - script: |
         set -ex

From eb35791abad56973c58c001e2e4f4a7df79151ce Mon Sep 17 00:00:00 2001
From: Yue Gao <yuega2@cisco.com>
Date: Mon, 3 Feb 2025 10:01:38 -0800
Subject: [PATCH 07/12] Change to mv sonic-platform-vpp to
 sonic-buildimage/platform/vpp

---
 azure-pipelines.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 227fa54..0a9d77c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -73,12 +73,12 @@ stages:
         rm -rf platform/vpp
       workingDirectory: $(System.DefaultWorkingDirectory)/sonic-buildimage
     - checkout: self
-      path: $(System.DefaultWorkingDirectory)/sonic-buildimage/platform/vpp
       displayName: 'checkout sonic-platform-vpp'
-    - script: |
+    - script: | 
         set -ex
+        mv $(System.DefaultWorkingDirectory)/sonic-platform-vpp $(System.DefaultWorkingDirectory)/sonic-buildimage/platform/vpp
+        cd $(System.DefaultWorkingDirectory)/sonic-buildimage/platform/vpp
         git revert 67edf2f39c -n
-      workingDirectory: $(System.DefaultWorkingDirectory)/sonic-buildimage/platform/vpp
       displayName: 'revert 67edf2f39c'
     - script: |
         $(BUILD_OPTIONS) $(CACHE_OPTIONS) make configure PLATFORM=vpp

From e57ee6080b5f9db49d5acb31152259743aac1e4c Mon Sep 17 00:00:00 2001
From: Yue Gao <yuega2@cisco.com>
Date: Mon, 3 Feb 2025 10:42:57 -0800
Subject: [PATCH 08/12] Solve out of memory issue in agent

---
 azure-pipelines.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0a9d77c..6c21199 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -81,6 +81,10 @@ stages:
         git revert 67edf2f39c -n
       displayName: 'revert 67edf2f39c'
     - script: |
+        set -ex
+        sudo modprobe overlay
+        sudo apt-get install -y acl
+        sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
         $(BUILD_OPTIONS) $(CACHE_OPTIONS) make configure PLATFORM=vpp
       workingDirectory: $(System.DefaultWorkingDirectory)/sonic-buildimage
       displayName: 'make configure'

From 34a7a63a4a7cbe818e51ea3ddf16f4098b94ca79 Mon Sep 17 00:00:00 2001
From: Yue Gao <yuega2@cisco.com>
Date: Mon, 3 Feb 2025 11:43:27 -0800
Subject: [PATCH 09/12] Choose a different pool to solve OOM

---
 azure-pipelines.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6c21199..b8a6116 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -12,8 +12,8 @@ trigger:
     include:
     - main
 
-pool: sonicbld-1es
-
+pool:
+  vmImage: ubuntu-22.04
 schedules:
 - cron: "0 8 * * *"
   displayName: Daily midnight build
@@ -54,7 +54,7 @@ variables:
   - name: CACHE_OPTIONS
     value: SONIC_DPKG_CACHE_METHOD=cache SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/vpp
   - name: BUILD_OPTIONS
-    value: ENABLE_DOCKER_BASE_PULL=y USERNAME=admin SONIC_BUILD_JOBS=$(nproc) PLATFORM=vpp SONIC_VERSION_CONTROL_COMPONENTS=py2,py3,web,git,docker
+    value: ENABLE_DOCKER_BASE_PULL=y USERNAME=admin SONIC_BUILD_JOBS=$(nproc) SONIC_VERSION_CONTROL_COMPONENTS=py2,py3,web,git,docker
 stages:
 - stage: build
   jobs:

From eb4de28e13cefbc1bfc2e30d23e46b8990d2a484 Mon Sep 17 00:00:00 2001
From: Yue Gao <yuega2@cisco.com>
Date: Mon, 3 Feb 2025 11:54:23 -0800
Subject: [PATCH 10/12] Reduce SONIC_BUILD_JOB to 2

---
 azure-pipelines.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b8a6116..8094b51 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -12,8 +12,6 @@ trigger:
     include:
     - main
 
-pool:
-  vmImage: ubuntu-22.04
 schedules:
 - cron: "0 8 * * *"
   displayName: Daily midnight build
@@ -54,9 +52,11 @@ variables:
   - name: CACHE_OPTIONS
     value: SONIC_DPKG_CACHE_METHOD=cache SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/vpp
   - name: BUILD_OPTIONS
-    value: ENABLE_DOCKER_BASE_PULL=y USERNAME=admin SONIC_BUILD_JOBS=$(nproc) SONIC_VERSION_CONTROL_COMPONENTS=py2,py3,web,git,docker
+    value: ENABLE_DOCKER_BASE_PULL=y USERNAME=admin SONIC_BUILD_JOBS=2 SONIC_VERSION_CONTROL_COMPONENTS=py2,py3,web,git,docker
+
 stages:
 - stage: build
+  pool: sonicbld-1es
   jobs:
   - job:
     timeoutInMinutes: 450

From 07043b214ee99100e43423cb836ae500318499be Mon Sep 17 00:00:00 2001
From: yue-fred-gao <132678244+yue-fred-gao@users.noreply.github.com>
Date: Tue, 4 Feb 2025 13:54:27 -0500
Subject: [PATCH 11/12] Remove SONIC_BUILD_JOBS

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8094b51..f423da1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -52,7 +52,7 @@ variables:
   - name: CACHE_OPTIONS
     value: SONIC_DPKG_CACHE_METHOD=cache SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/vpp
   - name: BUILD_OPTIONS
-    value: ENABLE_DOCKER_BASE_PULL=y USERNAME=admin SONIC_BUILD_JOBS=2 SONIC_VERSION_CONTROL_COMPONENTS=py2,py3,web,git,docker
+    value: ENABLE_DOCKER_BASE_PULL=y USERNAME=admin SONIC_VERSION_CONTROL_COMPONENTS=py2,py3,web,git,docker
 
 stages:
 - stage: build

From ab62081cc352f2476239b42d7a281386f92b3b99 Mon Sep 17 00:00:00 2001
From: yue-fred-gao <132678244+yue-fred-gao@users.noreply.github.com>
Date: Wed, 5 Feb 2025 13:22:25 -0500
Subject: [PATCH 12/12] Add free to print memory usage

---
 azure-pipelines.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f423da1..8026e59 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -52,7 +52,7 @@ variables:
   - name: CACHE_OPTIONS
     value: SONIC_DPKG_CACHE_METHOD=cache SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/vpp
   - name: BUILD_OPTIONS
-    value: ENABLE_DOCKER_BASE_PULL=y USERNAME=admin SONIC_VERSION_CONTROL_COMPONENTS=py2,py3,web,git,docker
+    value: USERNAME=admin SONIC_VERSION_CONTROL_COMPONENTS=py2,py3,web,git,docker
 
 stages:
 - stage: build
@@ -76,20 +76,22 @@ stages:
       displayName: 'checkout sonic-platform-vpp'
     - script: | 
         set -ex
+        free -g
         mv $(System.DefaultWorkingDirectory)/sonic-platform-vpp $(System.DefaultWorkingDirectory)/sonic-buildimage/platform/vpp
         cd $(System.DefaultWorkingDirectory)/sonic-buildimage/platform/vpp
         git revert 67edf2f39c -n
       displayName: 'revert 67edf2f39c'
     - script: |
         set -ex
+        free -g
         sudo modprobe overlay
         sudo apt-get install -y acl
         sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
-        $(BUILD_OPTIONS) $(CACHE_OPTIONS) make configure PLATFORM=vpp
+        NOBUSTER=1 NOBULLSEYE=1 ENABLE_DOCKER_BASE_PULL=y make $(BUILD_OPTIONS) $(CACHE_OPTIONS) configure PLATFORM=vpp
       workingDirectory: $(System.DefaultWorkingDirectory)/sonic-buildimage
       displayName: 'make configure'
     - script: |
-        $(BUILD_OPTIONS) $(CACHE_OPTIONS) make target/debs/${{ parameters.debian_version }}/libvppinfra_main-release_amd64.deb
+        NOBUSTER=1 NOBULLSEYE=1 ENABLE_DOCKER_BASE_PULL=y make $(BUILD_OPTIONS) $(CACHE_OPTIONS) target/debs/${{ parameters.debian_version }}/libvppinfra_main-release_amd64.deb
         find target/debs/${{ parameters.debian_version }}/ -name "*vpp*.deb" -exec cp {} /$(System.DefaultWorkingDirectory)/artifacts \; 
       workingDirectory: $(System.DefaultWorkingDirectory)/sonic-buildimage
       displayName: "Build VPP packages from source"
@@ -97,7 +99,7 @@ stages:
       artifact: vpp
       displayName: "Archive vpp debian packages"
     - script: |
-        $(BUILD_OPTIONS) $(CACHE_OPTIONS) make target/sonic-vpp.img.gz
+        NOBUSTER=1 NOBULLSEYE=1 ENABLE_DOCKER_BASE_PULL=y make $(BUILD_OPTIONS) $(CACHE_OPTIONS) target/sonic-vpp.img.gz
       workingDirectory: $(System.DefaultWorkingDirectory)/sonic-buildimage
       displayName: "Build sonic-vpp image"
     - publish: $(System.DefaultWorkingDirectory)/target/sonic-vpp.img.gz