From 1be01c0322e87a5282fda9007902ab3326c917c2 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 16:57:56 +0800
Subject: [PATCH 01/76] Update azure-pipelines.yml for Azure Pipelines

---
 azure-pipelines.yml | 145 +++++---------------------------------------
 1 file changed, 15 insertions(+), 130 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5d36ff5be8ec..ab658a31959d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,136 +1,21 @@
-# Starter pipeline
 # Start with a minimal pipeline that you can customize to build and deploy your code.
 # Add steps that build, run tests, deploy, and more:
 # https://aka.ms/yaml
 
-trigger:
+schedules:
+- cron: "0 8 * * *"
+  displayName: Daily midnight build
   branches:
     include:
-      - master
-      - 202012
-  paths:
-    exclude:
-      - .github
-
-pr:
-  branches:
-    include:
-      - master
-  paths:
-    exclude:
-      - .github
-
-name: $(TeamProject)_$(Build.DefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
-
-resources:
-  repositories:
-  - repository: sonic-mgmt
-    type: github
-    name: Azure/sonic-mgmt
-    endpoint: build
-
-stages:
-- stage: Build
-  pool: sonicbld
-
-  jobs:
-  - template: .azure-pipelines/build-template.yml
-    parameters:
-      platform: broadcom
-      platform_short: brcm
-      cache_mode: rcache
-      sync_rpc_image: true
-
-  - template: .azure-pipelines/build-template.yml
-    parameters:
-      platform: mellanox
-      platform_short: mlnx
-      cache_mode: rcache
-      sync_rpc_image: true
-
-  - template: .azure-pipelines/build-template.yml
-    parameters:
-      platform: vs
-      platform_short: vs
-      cache_mode: rcache
-
-- 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
+    - master
+  always: true
+ 
+trigger: none
+pr: none
+ 
+jobs:
+- template: build-template.yml
+  parameters:
+    platform: ${{ variables['platform'] }}
+    cache_mode: wcache
+    swi_image: true
\ No newline at end of file

From 3667680d471fb65e253d66f62ed062d40d257ad3 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 16:58:37 +0800
Subject: [PATCH 02/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ab658a31959d..596bab5593d8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,7 +14,7 @@ trigger: none
 pr: none
  
 jobs:
-- template: build-template.yml
+- template: .azure-pipelines/build-template.yml
   parameters:
     platform: ${{ variables['platform'] }}
     cache_mode: wcache

From 2ba4e5ff56baa707ec015dc123f48fff23fd19ff Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 16:59:32 +0800
Subject: [PATCH 03/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 596bab5593d8..c19fcc030b41 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,5 +17,6 @@ jobs:
 - template: .azure-pipelines/build-template.yml
   parameters:
     platform: ${{ variables['platform'] }}
+    platform_short: ${{ variables['platform_short'] }}
     cache_mode: wcache
     swi_image: true
\ No newline at end of file

From cc36392350f8efa1b6cc76e261acbec278d03e60 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 17:00:22 +0800
Subject: [PATCH 04/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c19fcc030b41..05a8930732ea 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -12,7 +12,7 @@ schedules:
  
 trigger: none
 pr: none
- 
+
 jobs:
 - template: .azure-pipelines/build-template.yml
   parameters:

From b4ab487cd281bae28a8767b1ce626eeb12087d5d Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 17:03:39 +0800
Subject: [PATCH 05/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 05a8930732ea..d3ff9540dabb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,7 +16,7 @@ pr: none
 jobs:
 - template: .azure-pipelines/build-template.yml
   parameters:
-    platform: ${{ variables['platform'] }}
-    platform_short: ${{ variables['platform_short'] }}
+    platform: $(platform)
+    platform_short: $(platform)
     cache_mode: wcache
     swi_image: true
\ No newline at end of file

From c70dd67e9d39e27ec54df8ef2bc52a23d4f18006 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 17:04:39 +0800
Subject: [PATCH 06/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d3ff9540dabb..133b579549b4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,7 +16,7 @@ pr: none
 jobs:
 - template: .azure-pipelines/build-template.yml
   parameters:
-    platform: $(platform)
-    platform_short: $(platform)
+    platform: '$(platform)'
+    platform_short: '$(platform)'
     cache_mode: wcache
     swi_image: true
\ No newline at end of file

From 7dbf3e10c9afb51b10e38bdb973d2aa67b331537 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 17:05:38 +0800
Subject: [PATCH 07/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 133b579549b4..48176a430407 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,7 +16,7 @@ pr: none
 jobs:
 - template: .azure-pipelines/build-template.yml
   parameters:
-    platform: '$(platform)'
-    platform_short: '$(platform)'
+    platform: $[variables.platform]
+    platform_short: $[variables.platform]
     cache_mode: wcache
     swi_image: true
\ No newline at end of file

From 1d72779ca952529d41ed1bccced98e29bf82ac1d Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 17:11:50 +0800
Subject: [PATCH 08/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 48176a430407..1f93ffa10c3a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,7 +16,7 @@ pr: none
 jobs:
 - template: .azure-pipelines/build-template.yml
   parameters:
-    platform: $[variables.platform]
-    platform_short: $[variables.platform]
+    platform: '$[variables.platform]'
+    platform_short: '$[variables.platform]'
     cache_mode: wcache
     swi_image: true
\ No newline at end of file

From 2532392d22804d9444e3fe561db756091983c64d Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 17:12:29 +0800
Subject: [PATCH 09/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1f93ffa10c3a..dfb310412e81 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,7 +16,7 @@ pr: none
 jobs:
 - template: .azure-pipelines/build-template.yml
   parameters:
-    platform: '$[variables.platform]'
-    platform_short: '$[variables.platform]'
+    platform: "$(PLATFORM)"
+    platform_short: "$(PLATFORM)"
     cache_mode: wcache
     swi_image: true
\ No newline at end of file

From 8709679d7803e55f6faecc45bde7a0ce02a85927 Mon Sep 17 00:00:00 2001
From: xumia <xumia@microsoft.com>
Date: Thu, 11 Mar 2021 09:14:01 +0000
Subject: [PATCH 10/76] Fix bug

---
 .azure-pipelines/build-template.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
index c1cc04836a94..ebb095db6358 100644
--- a/.azure-pipelines/build-template.yml
+++ b/.azure-pipelines/build-template.yml
@@ -1,12 +1,6 @@
 parameters:
 - name: platform
   type: string
-  values:
-  - broadcom
-  - centec-arm64
-  - marvell-armhf
-  - mellanox
-  - vs
 
 - name: platform_arch
   type: string
@@ -18,12 +12,6 @@ parameters:
 
 - name: platform_short
   type: string
-  values:
-  - brcm
-  - centec-arm64
-  - marvell-armhf
-  - mlnx
-  - vs
 
 - name: cache_mode
   type: string

From 06ae66f1eba0af25f385c556c969f1a00c67ba73 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 17:16:05 +0800
Subject: [PATCH 11/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index dfb310412e81..d3ff9540dabb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,7 +16,7 @@ pr: none
 jobs:
 - template: .azure-pipelines/build-template.yml
   parameters:
-    platform: "$(PLATFORM)"
-    platform_short: "$(PLATFORM)"
+    platform: $(platform)
+    platform_short: $(platform)
     cache_mode: wcache
     swi_image: true
\ No newline at end of file

From e7c8863c295b08e5e4b8b0321f426d7e45de8ae9 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 17:17:41 +0800
Subject: [PATCH 12/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d3ff9540dabb..936835217173 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,10 +13,13 @@ schedules:
 trigger: none
 pr: none
 
+variables:
+  TEST: $(platform)
+
 jobs:
 - template: .azure-pipelines/build-template.yml
   parameters:
-    platform: $(platform)
-    platform_short: $(platform)
+    platform: $(TEST)
+    platform_short: $(TEST)
     cache_mode: wcache
     swi_image: true
\ No newline at end of file

From 9a70a062ea21724ab589f87e4f7a0ef932762cc2 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 17:20:18 +0800
Subject: [PATCH 13/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 936835217173..eb5666266b0a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -19,7 +19,7 @@ variables:
 jobs:
 - template: .azure-pipelines/build-template.yml
   parameters:
-    platform: $(TEST)
-    platform_short: $(TEST)
+    platform: ${{ variables.TEST }}
+    platform_short: ${{ variables.TEST }}
     cache_mode: wcache
     swi_image: true
\ No newline at end of file

From b0a0a411be77d559104b29bd8f151258b9e579bb Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 17:27:50 +0800
Subject: [PATCH 14/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index eb5666266b0a..5271aa07e694 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,13 +13,15 @@ schedules:
 trigger: none
 pr: none
 
-variables:
-  TEST: $(platform)
+parameters:
+  - name: TEST
+    type: string
+    default: $(platform)
 
 jobs:
 - template: .azure-pipelines/build-template.yml
   parameters:
-    platform: ${{ variables.TEST }}
-    platform_short: ${{ variables.TEST }}
+    platform: ${{ parameters.TEST }}
+    platform_short: ${{ parameters.TEST }}
     cache_mode: wcache
     swi_image: true
\ No newline at end of file

From 3475e0819466ec6c7c4af2fade95daed031e662f Mon Sep 17 00:00:00 2001
From: xumia <xumia@microsoft.com>
Date: Thu, 11 Mar 2021 09:39:25 +0000
Subject: [PATCH 15/76] Fix bug

---
 .azure-pipelines/build-template.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
index ebb095db6358..8d8e9ac5d05a 100644
--- a/.azure-pipelines/build-template.yml
+++ b/.azure-pipelines/build-template.yml
@@ -47,10 +47,17 @@ parameters:
   type: number
   default: 600
 
+- name: job_name
+  type: string
+  default: ''
+
 jobs:
 - job:
   pool: ${{ parameters.pool }}
-  displayName: ${{ parameters.platform }}
+  ${{ if ne(parameters.job_name, '') }}:
+    displayName: ${{ parameters.job_name }}
+  ${{ if eq(parameters.job_name, '') }}:
+    displayName: ${{ parameters.platform }}
   timeoutInMinutes: ${{ parameters.timeout }}
   steps:
   - template: cleanup.yml

From 1f0599e6b2ddfbb25168d8b4e47fc089b9241cc1 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 17:39:54 +0800
Subject: [PATCH 16/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5271aa07e694..8f835e31bcea 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,15 +13,11 @@ schedules:
 trigger: none
 pr: none
 
-parameters:
-  - name: TEST
-    type: string
-    default: $(platform)
-
 jobs:
 - template: .azure-pipelines/build-template.yml
   parameters:
-    platform: ${{ parameters.TEST }}
-    platform_short: ${{ parameters.TEST }}
+    platform: $(platform)
+    platform_short: $(platform)
+    job_name: "build"
     cache_mode: wcache
     swi_image: true
\ No newline at end of file

From db990651dd90a167960728f73b788aaae60a9ccd Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 18:15:15 +0800
Subject: [PATCH 17/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8f835e31bcea..21ad040f09d6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,11 +13,17 @@ schedules:
 trigger: none
 pr: none
 
-jobs:
-- template: .azure-pipelines/build-template.yml
-  parameters:
-    platform: $(platform)
-    platform_short: $(platform)
-    job_name: "build"
-    cache_mode: wcache
-    swi_image: true
\ No newline at end of file
+stages:
+- stage: Build
+  jobs:
+  - template: azure-pipelines-build.yml
+    parameters:
+      buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
+      jobFilters: $(PLATFORM)
+      postSteps:
+      - script: |
+          make freeze
+          git status files/build/versions
+          git add files/build/versions
+          git diff HEAD files/build/versions
+        displayName: "Show git diff"
\ No newline at end of file

From 68e8dc1f6aca875bb3641355a5a07ef70e88a9c4 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 18:15:40 +0800
Subject: [PATCH 18/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 21ad040f09d6..aa2de73845a5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,7 +16,7 @@ pr: none
 stages:
 - stage: Build
   jobs:
-  - template: azure-pipelines-build.yml
+  - template: .azurepipleins/azure-pipelines-build.yml
     parameters:
       buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
       jobFilters: $(PLATFORM)

From 358d2c2509bbf6a720340c32510bcdd1b7898e18 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 18:16:18 +0800
Subject: [PATCH 19/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index aa2de73845a5..d7c3575c41ec 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,7 +16,7 @@ pr: none
 stages:
 - stage: Build
   jobs:
-  - template: .azurepipleins/azure-pipelines-build.yml
+  - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
       buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
       jobFilters: $(PLATFORM)

From b04a51be8bec6563635d8e9178cee4be973463e5 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 18:19:09 +0800
Subject: [PATCH 20/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d7c3575c41ec..ffb68563db99 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,13 +13,15 @@ schedules:
 trigger: none
 pr: none
 
+pool: sonicbld
+
 stages:
 - stage: Build
   jobs:
-  - template: .azure-pipelines/azure-pipelines-build.yml
+  - template: azure-pipelines-build.yml
     parameters:
       buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
-      jobFilters: $(PLATFORM)
+      jobFilters: vs
       postSteps:
       - script: |
           make freeze

From 5095d68bb18922901c9bad58afec5f48178dce49 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 18:19:26 +0800
Subject: [PATCH 21/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ffb68563db99..c73e73265aa5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -18,7 +18,7 @@ pool: sonicbld
 stages:
 - stage: Build
   jobs:
-  - template: azure-pipelines-build.yml
+  - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
       buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
       jobFilters: vs

From 61337aff6db91a907ca2cf0316957cc1bfd1a618 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 18:19:43 +0800
Subject: [PATCH 22/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c73e73265aa5..b89e30b54e5b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,7 +21,6 @@ stages:
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
       buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
-      jobFilters: vs
       postSteps:
       - script: |
           make freeze

From e2e6bfaa5aafcad9cafc1f69260ceb72e987390c Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 18:21:36 +0800
Subject: [PATCH 23/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b89e30b54e5b..e6a446812403 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,6 +21,8 @@ stages:
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
       buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
+      jobFilters:
+      - vs
       postSteps:
       - script: |
           make freeze

From 01f6462a3470c0ecbf6aa4aa9595f04b5e92a69b Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 18:22:24 +0800
Subject: [PATCH 24/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e6a446812403..c31bc5771428 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -22,7 +22,7 @@ stages:
     parameters:
       buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
       jobFilters:
-      - vs
+      - $(PLATFORM)
       postSteps:
       - script: |
           make freeze

From a8000c20a27eec58cc2ad24d4dc736c0f1d3b109 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 18:22:50 +0800
Subject: [PATCH 25/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c31bc5771428..b62821953749 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -22,7 +22,7 @@ stages:
     parameters:
       buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
       jobFilters:
-      - $(PLATFORM)
+      - '$(PLATFORM)'
       postSteps:
       - script: |
           make freeze

From 84a37d7f7dedefe1b322b929a91dda3c2d508f36 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Thu, 11 Mar 2021 18:25:10 +0800
Subject: [PATCH 26/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b62821953749..e6a446812403 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -22,7 +22,7 @@ stages:
     parameters:
       buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
       jobFilters:
-      - '$(PLATFORM)'
+      - vs
       postSteps:
       - script: |
           make freeze

From c6ff2126375b6e6d7b450eea5dfdd41f17970d00 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 12 Mar 2021 10:59:43 +0800
Subject: [PATCH 27/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e6a446812403..e3b6fdf732de 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -18,6 +18,8 @@ pool: sonicbld
 stages:
 - stage: Build
   jobs:
+  - job: job1
+    timeoutInMinutes: $(TIMEOUTINMINUTES)
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
       buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'

From 9609eded06f8153929de766cf7ffbd4ec0c12742 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 12 Mar 2021 11:01:15 +0800
Subject: [PATCH 28/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e3b6fdf732de..22757899ba49 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,6 +13,9 @@ schedules:
 trigger: none
 pr: none
 
+variables:
+  TIMEOUTINMINUTES: 400
+
 pool: sonicbld
 
 stages:

From 4cee1dbd25f4860dbb78777ca4c6fb73ba3dde31 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 12 Mar 2021 11:02:09 +0800
Subject: [PATCH 29/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 22757899ba49..75875b2b7fed 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -23,6 +23,8 @@ stages:
   jobs:
   - job: job1
     timeoutInMinutes: $(TIMEOUTINMINUTES)
+    steps:
+      - script: echo abc
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
       buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'

From abc24df329ffe3718923bff7fb008dc98f2f0c9e Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 12 Mar 2021 11:03:17 +0800
Subject: [PATCH 30/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 75875b2b7fed..2bb0af98a9e0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -22,7 +22,7 @@ stages:
 - stage: Build
   jobs:
   - job: job1
-    timeoutInMinutes: $(TIMEOUTINMINUTES)
+    timeoutInMinutes: $[ variables['TIMEOUTINMINUTES']
     steps:
       - script: echo abc
   - template: .azure-pipelines/azure-pipelines-build.yml

From 0c06b8e6e089bc01d5e8ad317dea332356d70d77 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 12 Mar 2021 11:03:47 +0800
Subject: [PATCH 31/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2bb0af98a9e0..ce7fbc4f4263 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -22,7 +22,7 @@ stages:
 - stage: Build
   jobs:
   - job: job1
-    timeoutInMinutes: $[ variables['TIMEOUTINMINUTES']
+    timeoutInMinutes: $[ variables['TIMEOUTINMINUTES'] ]
     steps:
       - script: echo abc
   - template: .azure-pipelines/azure-pipelines-build.yml

From 400c8a8ca43158eb421ffc1e57d9091be1ddc592 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 12 Mar 2021 11:06:40 +0800
Subject: [PATCH 32/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ce7fbc4f4263..1cd594a7a0fd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,9 +13,6 @@ schedules:
 trigger: none
 pr: none
 
-variables:
-  TIMEOUTINMINUTES: 400
-
 pool: sonicbld
 
 stages:
@@ -24,7 +21,9 @@ stages:
   - job: job1
     timeoutInMinutes: $[ variables['TIMEOUTINMINUTES'] ]
     steps:
-      - script: echo abc
+      - script: |
+          sleep 120
+          echo abc
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
       buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'

From 7bc6342264c7a223ad8a27578644727ee83d40a5 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 12 Mar 2021 11:09:03 +0800
Subject: [PATCH 33/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1cd594a7a0fd..e175433f7cd8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -15,6 +15,9 @@ pr: none
 
 pool: sonicbld
 
+variables:
+  TIMEOUTINMINUTES: 2
+
 stages:
 - stage: Build
   jobs:
@@ -22,7 +25,7 @@ stages:
     timeoutInMinutes: $[ variables['TIMEOUTINMINUTES'] ]
     steps:
       - script: |
-          sleep 120
+          sleep 300
           echo abc
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:

From f8712fd6939c7eb5ad46f9363eb43b75afade563 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 12 Mar 2021 11:11:48 +0800
Subject: [PATCH 34/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e175433f7cd8..a1ec68824c86 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,7 +16,7 @@ pr: none
 pool: sonicbld
 
 variables:
-  TIMEOUTINMINUTES: 2
+  TIMEOUTINMINUTES: 1
 
 stages:
 - stage: Build

From 8509485ca9362e8b801b22b9740745dc150ce1ab Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Fri, 12 Mar 2021 11:14:02 +0800
Subject: [PATCH 35/76] Update azure-pipelines.yml for Azure Pipelines

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a1ec68824c86..84027d4a1f2e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -22,7 +22,10 @@ stages:
 - stage: Build
   jobs:
   - job: job1
-    timeoutInMinutes: $[ variables['TIMEOUTINMINUTES'] ]
+    ${{ if ne(variables.TIMEOUTINMINUTES, '' ) }}:
+      timeoutInMinutes: $[ variables['TIMEOUTINMINUTES'] ]
+    ${{ if eq(variables.TIMEOUTINMINUTES, '' ) }}:
+      timeoutInMinutes: 2
     steps:
       - script: |
           sleep 300

From 51b8745a7d5ecbcc5b2ec1abdbf1ffd77a15863d Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 14:07:47 +0800
Subject: [PATCH 36/76] Create automerge.yml

---
 .github/workflows/automerge.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/automerge.yml

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
new file mode 100644
index 000000000000..6fe0e0a910ae
--- /dev/null
+++ b/.github/workflows/automerge.yml
@@ -0,0 +1,25 @@
+# This workflow will merge pull requests automatically
+#
+
+
+name: automerge
+on:
+  pull_request:
+    types:
+    - opened
+    branches:
+    - '202012'
+    paths-ignore:
+    - '!files/build/versions/**'
+  check_suite:
+    types:
+      - completed
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+    - name: automerge
+      if: github.event.pull_request.user.login == 'mssonicbld'
+      uses: 'pascalgn/automerge-action@v0.13.1'
+      env:
+        GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'

From c76f3a287801e2fb5edde9499949326d8a024530 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 14:10:07 +0800
Subject: [PATCH 37/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 6fe0e0a910ae..99cc5c91f877 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -1,14 +1,13 @@
 # This workflow will merge pull requests automatically
 #
 
-
 name: automerge
 on:
   pull_request:
     types:
     - opened
     branches:
-    - '202012'
+    - 'master'
     paths-ignore:
     - '!files/build/versions/**'
   check_suite:

From 04c63ef0bb630a105c05a2d309acd15f92818dda Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 14:11:53 +0800
Subject: [PATCH 38/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 99cc5c91f877..2019c3417a53 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: automerge
-      if: github.event.pull_request.user.login == 'mssonicbld'
+      if: github.event.pull_request.user.login == 'xumia'
       uses: 'pascalgn/automerge-action@v0.13.1'
       env:
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'

From 9effda1ebb2b7673fbefc17ce50c27f64f06fc5c Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 14:17:42 +0800
Subject: [PATCH 39/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 2019c3417a53..92c14b1ecd33 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -22,3 +22,5 @@ jobs:
       uses: 'pascalgn/automerge-action@v0.13.1'
       env:
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+        MERGE_LABELS: ''
+        MERGE_METHOD: "squash"

From 1cccf91b21db52170c4aa21470b73e5329a299e6 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 14:18:56 +0800
Subject: [PATCH 40/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 92c14b1ecd33..6eeb47ed422c 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -6,6 +6,7 @@ on:
   pull_request:
     types:
     - opened
+    - reopened
     branches:
     - 'master'
     paths-ignore:

From 4e7fd53e9cc90c6b93e6bcd18c59947b7899fa49 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 14:19:18 +0800
Subject: [PATCH 41/76] Create versions-test (#23)

---
 files/build/versions/versions-test | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 files/build/versions/versions-test

diff --git a/files/build/versions/versions-test b/files/build/versions/versions-test
new file mode 100644
index 000000000000..8c2ce78213e0
--- /dev/null
+++ b/files/build/versions/versions-test
@@ -0,0 +1 @@
+test==1.1.1

From 65fef988e22e8340fd7b83be78c21c39d51ddec6 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 14:19:58 +0800
Subject: [PATCH 42/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 6eeb47ed422c..6d91a8a80999 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: automerge
-      if: github.event.pull_request.user.login == 'xumia'
+      if: github.event.pull_request.user.login == 'mssonicbld'
       uses: 'pascalgn/automerge-action@v0.13.1'
       env:
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'

From de58054239cd45477abc2e733941cab2676a3ce5 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 14:25:59 +0800
Subject: [PATCH 43/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 6d91a8a80999..6eeb47ed422c 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: automerge
-      if: github.event.pull_request.user.login == 'mssonicbld'
+      if: github.event.pull_request.user.login == 'xumia'
       uses: 'pascalgn/automerge-action@v0.13.1'
       env:
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'

From 7c26da1f7787ecbf5a7182c11c26a8df651b9d4f Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 14:26:22 +0800
Subject: [PATCH 44/76] Add test file (#25)

---
 files/build/versions-test          | 1 +
 files/build/versions/versions-test | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 files/build/versions-test

diff --git a/files/build/versions-test b/files/build/versions-test
new file mode 100644
index 000000000000..cc7bbe72e52d
--- /dev/null
+++ b/files/build/versions-test
@@ -0,0 +1 @@
+test==1.1.2
diff --git a/files/build/versions/versions-test b/files/build/versions/versions-test
index 8c2ce78213e0..cc7bbe72e52d 100644
--- a/files/build/versions/versions-test
+++ b/files/build/versions/versions-test
@@ -1 +1 @@
-test==1.1.1
+test==1.1.2

From 8266804324aaa137f4509d789f40f3622756a80a Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 14:32:15 +0800
Subject: [PATCH 45/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 6eeb47ed422c..4ab8fc0440a4 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -9,8 +9,8 @@ on:
     - reopened
     branches:
     - 'master'
-    paths-ignore:
-    - '!files/build/versions/**'
+    paths:
+    - 'files/build/versions/**'
   check_suite:
     types:
       - completed

From 5dca0af8228de806af3c33f7b15b48e1d6e8e070 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 14:34:44 +0800
Subject: [PATCH 46/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 4ab8fc0440a4..666a03d04193 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -9,6 +9,7 @@ on:
     - reopened
     branches:
     - 'master'
+    - '202012'
     paths:
     - 'files/build/versions/**'
   check_suite:

From d93f27d01e8d24107e58ac5e69fff0025b711b34 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 14:36:11 +0800
Subject: [PATCH 47/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 666a03d04193..7b3bdec60a2e 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -9,7 +9,7 @@ on:
     - reopened
     branches:
     - 'master'
-    - '202012'
+    - 'xumia/202012'
     paths:
     - 'files/build/versions/**'
   check_suite:

From 755450aab1d6ce5481338723a29ace841f9174ea Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 15:07:37 +0800
Subject: [PATCH 48/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 7b3bdec60a2e..cf00887a3a92 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -3,18 +3,14 @@
 
 name: automerge
 on:
-  pull_request:
+  check_suite:
     types:
-    - opened
-    - reopened
+      - completed
     branches:
     - 'master'
     - 'xumia/202012'
     paths:
     - 'files/build/versions/**'
-  check_suite:
-    types:
-      - completed
 jobs:
   automerge:
     runs-on: ubuntu-latest
@@ -25,4 +21,6 @@ jobs:
       env:
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
         MERGE_LABELS: ''
-        MERGE_METHOD: "squash"
+        MERGE_METHOD: 'squash'
+        MERGE_FILTER_AUTHOR: 'xumia'
+        MERGE_DELETE_BRANCH: true

From 1c784cd4fa6a382ae1aad7030652287f3bd52ae3 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 16:58:34 +0800
Subject: [PATCH 49/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index cf00887a3a92..c364b3121b45 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -6,17 +6,12 @@ on:
   check_suite:
     types:
       - completed
-    branches:
-    - 'master'
-    - 'xumia/202012'
-    paths:
-    - 'files/build/versions/**'
 jobs:
   automerge:
+    if: github.ref == 'refs/heads/xumia/202012'
     runs-on: ubuntu-latest
     steps:
     - name: automerge
-      if: github.event.pull_request.user.login == 'xumia'
       uses: 'pascalgn/automerge-action@v0.13.1'
       env:
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'

From f1c40de4324ad430b3f9c57aaedcdd26845a8ad3 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 17:09:41 +0800
Subject: [PATCH 50/76] Create label.yml

---
 .github/workflows/label.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/label.yml

diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
new file mode 100644
index 000000000000..854122f0f653
--- /dev/null
+++ b/.github/workflows/label.yml
@@ -0,0 +1,25 @@
+# This workflow will triage pull requests and apply a label based on the
+# paths that are modified in the pull request.
+#
+# To use this workflow, you will need to set up a .github/labeler.yml
+# file with configuration.  For more information, see:
+# https://github.com/actions/labeler
+
+name: Labeler
+on:
+  pull_request:
+    types:
+    - opened
+    - reopened
+    branches:
+    - '202012'
+    paths:
+    - 'files/build/versions/**'
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v2
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

From d5a56b15f4993d80d43fd379597d0a58d8420af5 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 17:10:46 +0800
Subject: [PATCH 51/76] Create labeler.yml

---
 .github/labeler.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .github/labeler.yml

diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 000000000000..3a4a84eaf46a
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,2 @@
+automerge:
+- all: ['files/build/versions/*']

From c784ae0e3d1deff9e025002400695618fb969329 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 17:12:06 +0800
Subject: [PATCH 52/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index c364b3121b45..16b23a0c2288 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -15,7 +15,7 @@ jobs:
       uses: 'pascalgn/automerge-action@v0.13.1'
       env:
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        MERGE_LABELS: ''
+        MERGE_LABELS: 'automerge1'
         MERGE_METHOD: 'squash'
         MERGE_FILTER_AUTHOR: 'xumia'
         MERGE_DELETE_BRANCH: true

From 0e3973f8b519bbee0a20db91b209e084751b2862 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 17:13:41 +0800
Subject: [PATCH 53/76] Update label.yml

---
 .github/workflows/label.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
index 854122f0f653..3340916d1d54 100644
--- a/.github/workflows/label.yml
+++ b/.github/workflows/label.yml
@@ -13,6 +13,7 @@ on:
     - reopened
     branches:
     - '202012'
+    - 'master'
     paths:
     - 'files/build/versions/**'
 

From 90d1b47a5cf4bcc83025ed06ae046f968cda1077 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 17:20:18 +0800
Subject: [PATCH 54/76] Update labeler.yml

---
 .github/labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 3a4a84eaf46a..f82a3afa5397 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,2 +1,2 @@
 automerge:
-- all: ['files/build/versions/*']
+- all: ['files/build/versions/*', 'files/build/versions/**/*']

From c1201af458681bfeaf13becdb927627722302609 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 17:22:20 +0800
Subject: [PATCH 55/76] Update label.yml

---
 .github/workflows/label.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
index 3340916d1d54..0e2461b5df26 100644
--- a/.github/workflows/label.yml
+++ b/.github/workflows/label.yml
@@ -21,6 +21,6 @@ jobs:
   label:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v2
+    - uses: actions/labeler@main
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

From 4fe78bf67538339ecd866052392e13f43ca0af1c Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 17:29:53 +0800
Subject: [PATCH 56/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 16b23a0c2288..37d6286bd10f 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -8,14 +8,14 @@ on:
       - completed
 jobs:
   automerge:
-    if: github.ref == 'refs/heads/xumia/202012'
+    if: github.event.check_suite.app.name == 'azure-pipelines' &&  github.event.check_suite.conclusion == 'success'
     runs-on: ubuntu-latest
     steps:
     - name: automerge
       uses: 'pascalgn/automerge-action@v0.13.1'
       env:
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        MERGE_LABELS: 'automerge1'
+        MERGE_LABELS: 'automerge'
         MERGE_METHOD: 'squash'
         MERGE_FILTER_AUTHOR: 'xumia'
         MERGE_DELETE_BRANCH: true

From dfb61c2a49bef32f92f473bed7a71995478acbef Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 18:05:47 +0800
Subject: [PATCH 57/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 37d6286bd10f..056bb40e88b4 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -8,9 +8,12 @@ on:
       - completed
 jobs:
   automerge:
-    if: github.event.check_suite.app.name == 'azure-pipelines' &&  github.event.check_suite.conclusion == 'success'
     runs-on: ubuntu-latest
     steps:
+    - name: print
+      run: |
+        echo "print info"
+        echo '${{ toJSON(github.event.check_suite) }}'
     - name: automerge
       uses: 'pascalgn/automerge-action@v0.13.1'
       env:

From 634f5fadfd2c4119e1c2f8ef521ac46fd0db5b36 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Tue, 16 Mar 2021 18:09:06 +0800
Subject: [PATCH 58/76] Update automerge.yml

---
 .github/workflows/automerge.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 056bb40e88b4..6c664fc66cb3 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -9,11 +9,8 @@ on:
 jobs:
   automerge:
     runs-on: ubuntu-latest
+    if: github.event.check_suite.app.name == 'Azure Pipelines' &&  github.event.check_suite.conclusion == 'success'
     steps:
-    - name: print
-      run: |
-        echo "print info"
-        echo '${{ toJSON(github.event.check_suite) }}'
     - name: automerge
       uses: 'pascalgn/automerge-action@v0.13.1'
       env:

From 52caed986dfea5900116136aa22e3916074acd34 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Sun, 4 Apr 2021 19:16:29 +0800
Subject: [PATCH 59/76] Update official-build.yml for Azure Pipelines

---
 .azure-pipelines/official-build.yml | 36 +----------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/.azure-pipelines/official-build.yml b/.azure-pipelines/official-build.yml
index 8524027d7b11..af1b6bfe75a2 100644
--- a/.azure-pipelines/official-build.yml
+++ b/.azure-pipelines/official-build.yml
@@ -18,31 +18,6 @@ stages:
 - stage: Build
 
   jobs:
-  - template: build-template.yml
-    parameters:
-      platform: broadcom
-      platform_short: brcm
-      cache_mode: wcache
-      dbg_image: true
-      swi_image: true
-      raw_image: true
-      sync_rpc_image: true
-
-  - template: build-template.yml
-    parameters:
-      platform: mellanox
-      platform_short: mlnx
-      cache_mode: wcache
-      dbg_image: true
-      sync_rpc_image: true
-
-  - template: build-template.yml
-    parameters:
-      platform: vs
-      platform_short: vs
-      dbg_image: true
-      cache_mode: wcache
-
   - template: build-template.yml
     parameters:
       timeout: 3600
@@ -50,13 +25,4 @@ stages:
       platform_arch: armhf
       platform_short: marvell-armhf
       cache_mode: wcache
-      pool: sonicbld_8c
-
-  - template: build-template.yml
-    parameters:
-      timeout: 3600
-      platform: centec-arm64
-      platform_arch: arm64
-      platform_short: centec-arm64
-      cache_mode: wcache
-      pool: sonicbld_8c
+      pool: sonic-arm64-bld-2

From e9a4796d2de9346d3a87c1c1ac1e8397d8b63a8c Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Sun, 4 Apr 2021 19:16:57 +0800
Subject: [PATCH 60/76] Update official-build.yml for Azure Pipelines

---
 .azure-pipelines/official-build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.azure-pipelines/official-build.yml b/.azure-pipelines/official-build.yml
index af1b6bfe75a2..c60242e91fa4 100644
--- a/.azure-pipelines/official-build.yml
+++ b/.azure-pipelines/official-build.yml
@@ -8,8 +8,7 @@ schedules:
   displayName: Daily midnight build
   branches:
     include:
-    - master
-  always: true
+    - disable
 
 trigger: none
 pr: none

From eefe87371f2472d9e4050dff8aba69d80a75230c Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Sun, 4 Apr 2021 19:18:08 +0800
Subject: [PATCH 61/76] Update build-template.yml

---
 .azure-pipelines/build-template.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
index 8d8e9ac5d05a..0a372591614f 100644
--- a/.azure-pipelines/build-template.yml
+++ b/.azure-pipelines/build-template.yml
@@ -22,9 +22,6 @@ parameters:
 
 - name: pool
   type: string
-  values:
-  - sonicbld
-  - sonicbld_8c
   default: sonicbld
 
 - name: dbg_image

From 2269b9febd88b5db7af43228761ff318e336acd5 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:20:02 +0800
Subject: [PATCH 62/76] Update azure-pipelines.yml

---
 azure-pipelines.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 84027d4a1f2e..2dfb4d9474d5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -30,15 +30,3 @@ stages:
       - script: |
           sleep 300
           echo abc
-  - template: .azure-pipelines/azure-pipelines-build.yml
-    parameters:
-      buildOptions: 'SONIC_CONFIG_BUILD_JOBS=1 SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
-      jobFilters:
-      - vs
-      postSteps:
-      - script: |
-          make freeze
-          git status files/build/versions
-          git add files/build/versions
-          git diff HEAD files/build/versions
-        displayName: "Show git diff"
\ No newline at end of file

From 46106b4bf279b86979f78b9729ceae00f94e3a1e Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:24:34 +0800
Subject: [PATCH 63/76] Update labeler.yml

---
 .github/labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index f82a3afa5397..d92f952628b4 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,2 +1,2 @@
 automerge:
-- all: ['files/build/versions/*', 'files/build/versions/**/*']
+- all: ['files/build/versions/**']

From 7a5fd01b138c7621e42f6ac7d026eb24f667a485 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:25:07 +0800
Subject: [PATCH 64/76] Update azure-pipelines.yml

---
 azure-pipelines.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2dfb4d9474d5..f3a38851c141 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -22,11 +22,6 @@ stages:
 - stage: Build
   jobs:
   - job: job1
-    ${{ if ne(variables.TIMEOUTINMINUTES, '' ) }}:
-      timeoutInMinutes: $[ variables['TIMEOUTINMINUTES'] ]
-    ${{ if eq(variables.TIMEOUTINMINUTES, '' ) }}:
-      timeoutInMinutes: 2
     steps:
       - script: |
-          sleep 300
           echo abc

From 82df54b70e158e640e1cb58d97d85e89251868a6 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:25:32 +0800
Subject: [PATCH 65/76] Update versions-test

---
 files/build/versions/versions-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build/versions/versions-test b/files/build/versions/versions-test
index cc7bbe72e52d..2d7087cde0b3 100644
--- a/files/build/versions/versions-test
+++ b/files/build/versions/versions-test
@@ -1 +1 @@
-test==1.1.2
+test==1.1.3

From 620d3fa0d3eaf898282fa711147ac7f0d2a9f075 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:29:57 +0800
Subject: [PATCH 66/76] Update versions-test

---
 files/build/versions-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build/versions-test b/files/build/versions-test
index cc7bbe72e52d..2d7087cde0b3 100644
--- a/files/build/versions-test
+++ b/files/build/versions-test
@@ -1 +1 @@
-test==1.1.2
+test==1.1.3

From e7f9033b1fe4dade516da4a31cf5d5e39f992d44 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:30:57 +0800
Subject: [PATCH 67/76] Update versions-test

---
 files/build/versions-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build/versions-test b/files/build/versions-test
index 2d7087cde0b3..cc7bbe72e52d 100644
--- a/files/build/versions-test
+++ b/files/build/versions-test
@@ -1 +1 @@
-test==1.1.3
+test==1.1.2

From e19f2c9e19c2e4680065e9b11c5a1419d08814d3 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:33:53 +0800
Subject: [PATCH 68/76] Update versions-test

---
 files/build/versions/versions-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build/versions/versions-test b/files/build/versions/versions-test
index 2d7087cde0b3..cc7bbe72e52d 100644
--- a/files/build/versions/versions-test
+++ b/files/build/versions/versions-test
@@ -1 +1 @@
-test==1.1.3
+test==1.1.2

From ffc7f7bc8e417736786af96a3a41e0a7254e834b Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:34:20 +0800
Subject: [PATCH 69/76] Update versions-test

---
 files/build/versions/versions-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build/versions/versions-test b/files/build/versions/versions-test
index cc7bbe72e52d..2d7087cde0b3 100644
--- a/files/build/versions/versions-test
+++ b/files/build/versions/versions-test
@@ -1 +1 @@
-test==1.1.2
+test==1.1.3

From 9a421a813f138d4e2e0f79c447ab94c0350b1558 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:36:26 +0800
Subject: [PATCH 70/76] Create versions-py3

---
 files/build/versions/test/versions-py3 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 files/build/versions/test/versions-py3

diff --git a/files/build/versions/test/versions-py3 b/files/build/versions/test/versions-py3
new file mode 100644
index 000000000000..8c2ce78213e0
--- /dev/null
+++ b/files/build/versions/test/versions-py3
@@ -0,0 +1 @@
+test==1.1.1

From 6c215a206d523bf81e7bd4664fe8ef10e3f79e2f Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:39:42 +0800
Subject: [PATCH 71/76] Update mask_disabled_services.py

---
 files/build_scripts/mask_disabled_services.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/build_scripts/mask_disabled_services.py b/files/build_scripts/mask_disabled_services.py
index f3a1d76bf102..d0e6bde8c30f 100755
--- a/files/build_scripts/mask_disabled_services.py
+++ b/files/build_scripts/mask_disabled_services.py
@@ -5,6 +5,7 @@
 
 INIT_CFG_FILE_PATH = '/etc/sonic/init_cfg.json'
 
+
 with open(INIT_CFG_FILE_PATH) as init_cfg_file:
     init_cfg = json.load(init_cfg_file)
     if 'FEATURE' in init_cfg:

From a47b3c8f2e8f8f87cfe11fa7a31f98692a8564cd Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:40:49 +0800
Subject: [PATCH 72/76] Update mask_disabled_services.py

---
 files/build_scripts/mask_disabled_services.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/files/build_scripts/mask_disabled_services.py b/files/build_scripts/mask_disabled_services.py
index d0e6bde8c30f..f3a1d76bf102 100755
--- a/files/build_scripts/mask_disabled_services.py
+++ b/files/build_scripts/mask_disabled_services.py
@@ -5,7 +5,6 @@
 
 INIT_CFG_FILE_PATH = '/etc/sonic/init_cfg.json'
 
-
 with open(INIT_CFG_FILE_PATH) as init_cfg_file:
     init_cfg = json.load(init_cfg_file)
     if 'FEATURE' in init_cfg:

From 98026a31815839637252fdaf093e99790432f825 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:42:42 +0800
Subject: [PATCH 73/76] Create versions-py2

---
 files/build/versions/test2/versions-py2 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 files/build/versions/test2/versions-py2

diff --git a/files/build/versions/test2/versions-py2 b/files/build/versions/test2/versions-py2
new file mode 100644
index 000000000000..8c2ce78213e0
--- /dev/null
+++ b/files/build/versions/test2/versions-py2
@@ -0,0 +1 @@
+test==1.1.1

From f95987bd5ca2563440e27e9b3ab3c018485b8487 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:43:08 +0800
Subject: [PATCH 74/76] Delete versions-py3

---
 files/build/versions/test/versions-py3 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 files/build/versions/test/versions-py3

diff --git a/files/build/versions/test/versions-py3 b/files/build/versions/test/versions-py3
deleted file mode 100644
index 8c2ce78213e0..000000000000
--- a/files/build/versions/test/versions-py3
+++ /dev/null
@@ -1 +0,0 @@
-test==1.1.1

From bf97e807fbbbc96ed4ce84c2fc61b79938061c24 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:45:38 +0800
Subject: [PATCH 75/76] Update versions-py2

---
 files/build/versions/test2/versions-py2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build/versions/test2/versions-py2 b/files/build/versions/test2/versions-py2
index 8c2ce78213e0..cc7bbe72e52d 100644
--- a/files/build/versions/test2/versions-py2
+++ b/files/build/versions/test2/versions-py2
@@ -1 +1 @@
-test==1.1.1
+test==1.1.2

From 56f3d8873d43c9261a10251b2471a1fe247dc12e Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:47:01 +0800
Subject: [PATCH 76/76] Update versions-test

---
 files/build/versions-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build/versions-test b/files/build/versions-test
index cc7bbe72e52d..2d7087cde0b3 100644
--- a/files/build/versions-test
+++ b/files/build/versions-test
@@ -1 +1 @@
-test==1.1.2
+test==1.1.3