Merge branch 'master' into internal

liushilongbuaa · Oct 18, 2021 · 4ea3880 · 4ea3880
2 parents 53b707d + e8adee2
commit 4ea3880
Show file tree

Hide file tree

Showing 764 changed files with 43,299 additions and 4,667 deletions.
diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
@@ -104,6 +104,11 @@ jobs:
               make $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-vs.img.gz && mv target/sonic-vs.img.gz target/sonic-vs-dbg.img.gz
             fi
             make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz
+            if [ $(Build.Reason) != 'PullRequest' ];then
+              gzip -kd target/sonic-vs.img.gz
+              SONIC_RUN_CMDS="qemu-img convert target/sonic-vs.img -O vhdx -o subformat=dynamic target/sonic-vs.vhdx" make sonic-slave-run
+              rm target/sonic-vs.img
+            fi
           else
             if [ $(dbg_image) == yes ]; then
               make  $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-$(GROUP_NAME).bin && \

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -26,7 +26,7 @@ jobs:
     jobVariables: ${{ parameters.jobVariables }}
     preSteps:
       - template: cleanup.yml
-      - ${{ parameters. preSteps }}
+      - ${{ parameters.preSteps }}
       - script: |
           if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox)$"; then
             CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
@@ -36,6 +36,7 @@ jobs:
         displayName: "Set cache options"
       - checkout: self
         submodules: recursive
+        condition: eq(variables.SKIP_CHECKOUT, '') 
         displayName: 'Checkout code'
       - script: |
           BRANCH_NAME=$(Build.SourceBranchName)

diff --git a/.azure-pipelines/official-build-cisco-8000.yml b/.azure-pipelines/official-build-cisco-8000.yml
@@ -0,0 +1,64 @@
+# 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
+
+schedules:
+- cron: "0 8 * * *"
+  displayName: Daily midnight build
+  branches:
+    include:
+    - master
+    - 202012
+  always: true
+
+trigger: none
+pr: none
+
+resources:
+  repositories:
+  - repository: cisco-8000
+    type: github
+    name: Cisco-8000-sonic/platform-cisco-8000
+    endpoint: cisco-connection
+
+stages:
+- stage: Build
+  pool: sonic
+  variables:
+    CACHE_MODE: wcache
+    SKIP_CHECKOUT: true
+    TERM: ''
+
+  jobs:
+  - template: azure-pipelines-build.yml
+    parameters:
+      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      preSteps:
+      - checkout: self
+        submodules: recursive
+        path: s
+        displayName: 'Checkout code'
+      - checkout: cisco-8000
+        submodules: recursive
+        path: s/platform/cisco-8000
+        displayName: 'Checkout cisco-8000'
+      - script: |
+          cisco_ref=(cat platform/checkout/cisco-8000.ini | grep '^ref=' | cut -d= -f2)
+          echo "The cisco 8000 release version is $cisco_ref"
+          echo "##vso[task.setvariable variable=cisco.ref]$cisco_ref"
+        displayName: 'Export cisco release version'
+      - task: DownloadGitHubRelease@0
+        inputs:
+          connection: cisco-connection
+          userRepository: Cisco-8000-sonic/platform-cisco-8000
+          defaultVersionType: specificTag
+          version: $(cisco.ref)
+          itemPattern: 'artifactory-*.tar.gz'
+          downloadPath: '$(System.ArtifactsDirectory)'
+      - script: |
+          make PLATFORM=cisco-8000 platform/cisco-8000
+          tar xfz $(System.ArtifactsDirectory)/artifactory-*.tar.gz -C platform/cisco-8000
+        displayName: 'Setup cisco artifacts'
+      jobGroups:
+      - name: cisco-8000
diff --git a/.azure-pipelines/official-build-multi-asic.yml b/.azure-pipelines/official-build-multi-asic.yml
@@ -0,0 +1,51 @@
+# 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
+
+schedules:
+- cron: "0 18 * * Sun,Wed,Fri"
+  displayName: "Alternate day build"
+  branches:
+    include:
+    - master
+  always: true
+
+trigger: none
+pr: none
+
+stages:
+- stage: Build
+  pool: sonicbld
+  variables:
+    CACHE_MODE: wcache
+    ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
+      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
+  jobs:
+  - template: azure-pipelines-build.yml
+    parameters:
+      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) BUILD_MULTIASIC_KVM=y ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      jobGroups:
+      - name: vs
+
+- stage: Test
+  variables:
+  - name: inventory
+    value: veos_vtb
+  - name: testbed_file
+    value: vtestbed.csv
+
+  jobs:
+  - job:
+    pool: sonictest
+    displayName: "kvmtest-multi-asic-t1-lag"
+    timeoutInMinutes: 240
+
+    steps:
+    - template: run-test-template.yml
+      parameters:
+        dut: vlab-08
+        tbname: vms-kvm-four-asic-t1-lag
+        ptf_name: ptf_vms6-4
+        tbtype: multi-asic-t1-lag
+        image: sonic-4asic-vs.img.gz
diff --git a/.azure-pipelines/run-test-template.yml b/.azure-pipelines/run-test-template.yml
@@ -7,6 +7,13 @@ parameters:
   type: string
 - name: ptf_name
   type: string
+- name: image
+  type: string
+  default: sonic-vs.img.gz
+  values:
+  - sonic-vs.img.gz
+  - sonic-4asic-vs.img.gz
+  - sonic-6asic-vs.img.gz
 
 steps:
 - checkout: self
@@ -21,7 +28,7 @@ steps:
 - script: |
     set -x
     sudo mkdir -p /data/sonic-vm/images
-    sudo cp -v ../target/sonic-vs.img.gz /data/sonic-vm/images/sonic-vs.img.gz
+    sudo cp -v ../target/${{ parameters.image}} /data/sonic-vm/images/sonic-vs.img.gz
     sudo gzip -fd /data/sonic-vm/images/sonic-vs.img.gz
     username=$(id -un)
     sudo chown -R $username.$username /data/sonic-vm

diff --git a/.gitignore b/.gitignore
@@ -82,3 +82,7 @@ files/build/tmp
 dockers/**/buildinfo
 platform/**/buildinfo
 sonic-slave*/**/buildinfo
+
+# Dev tools
+.vscode/
+.idea/
diff --git a/device/accton/x86_64-accton_as4630_54pe-r0/platform_asic b/device/accton/x86_64-accton_as4630_54pe-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as4630_54te-r0/platform_asic b/device/accton/x86_64-accton_as4630_54te-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as5712_54x-r0/platform_asic b/device/accton/x86_64-accton_as5712_54x-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as5812_54t-r0/platform_asic b/device/accton/x86_64-accton_as5812_54t-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as5812_54x-r0/platform_asic b/device/accton/x86_64-accton_as5812_54x-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as5835_54t-r0/platform_asic b/device/accton/x86_64-accton_as5835_54t-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as5835_54x-r0/platform_asic b/device/accton/x86_64-accton_as5835_54x-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as6712_32x-r0/platform_asic b/device/accton/x86_64-accton_as6712_32x-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X-R0/buffers_defaults_t0.j2 b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X-R0/buffers_defaults_t0.j2
@@ -39,19 +39,19 @@
     },
     "BUFFER_PROFILE": {
         "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "pool":"ingress_lossless_pool",
             "xon":"78400",
             "xoff":"132160",
             "size":"3584",
             "static_th":"82880"
         },
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "pool":"ingress_lossy_pool",
             "size":"3584",
             "dynamic_th":"-1"
         },
         "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "pool":"egress_lossy_pool",
             "size":"3584",
             "dynamic_th":"-4"
         }

diff --git a/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X-R0/buffers_defaults_t1.j2 b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X-R0/buffers_defaults_t1.j2
@@ -39,19 +39,19 @@
     },
     "BUFFER_PROFILE": {
         "ingress_lossless_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "pool":"ingress_lossless_pool",
             "xon":"78400",
             "xoff":"132160",
             "size":"3584",
             "static_th":"82880"
         },
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "pool":"ingress_lossy_pool",
             "size":"3584",
             "dynamic_th":"-1"
         },
         "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "pool":"egress_lossy_pool",
             "size":"3584",
             "dynamic_th":"-4"
         }

diff --git a/device/accton/x86_64-accton_as7116_54x-r0/platform_asic b/device/accton/x86_64-accton_as7116_54x-r0/platform_asic
@@ -0,0 +1 @@
+nephos
diff --git a/device/accton/x86_64-accton_as7212_54x-r0/platform_asic b/device/accton/x86_64-accton_as7212_54x-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as7312_54x-r0/platform_asic b/device/accton/x86_64-accton_as7312_54x-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as7312_54xs-r0/platform_asic b/device/accton/x86_64-accton_as7312_54xs-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as7315_27xb-r0/platform_asic b/device/accton/x86_64-accton_as7315_27xb-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as7326_56x-r0/platform_asic b/device/accton/x86_64-accton_as7326_56x-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as7512_32x-r0/platform_asic b/device/accton/x86_64-accton_as7512_32x-r0/platform_asic
@@ -0,0 +1 @@
+cavium
diff --git a/device/accton/x86_64-accton_as7712_32x-r0/platform_asic b/device/accton/x86_64-accton_as7712_32x-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as7716_32x-r0/platform_asic b/device/accton/x86_64-accton_as7716_32x-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as7716_32xb-r0/platform_asic b/device/accton/x86_64-accton_as7716_32xb-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/platform_asic b/device/accton/x86_64-accton_as7726_32x-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as7816_64x-r0/platform_asic b/device/accton/x86_64-accton_as7816_64x-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as9716_32d-r0/platform_asic b/device/accton/x86_64-accton_as9716_32d-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_as9726_32d-r0/platform_asic b/device/accton/x86_64-accton_as9726_32d-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/accton/x86_64-accton_minipack-r0/platform_asic b/device/accton/x86_64-accton_minipack-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/alphanetworks/x86_64-alphanetworks_snh60a0_320fv2-r0/platform_asic b/device/alphanetworks/x86_64-alphanetworks_snh60a0_320fv2-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/alphanetworks/x86_64-alphanetworks_snh60b0_640f-r0/platform_asic b/device/alphanetworks/x86_64-alphanetworks_snh60b0_640f-r0/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t0.j2
@@ -27,17 +27,17 @@
     },
     "BUFFER_PROFILE": {
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "pool":"ingress_lossless_pool",
             "size":"0",
             "dynamic_th":"3"
         },
         "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "pool":"egress_lossless_pool",
             "size":"0",
             "static_th":"12766208"
         },
         "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "pool":"egress_lossy_pool",
             "size":"1518",
             "dynamic_th":"3"
         }

diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t1.j2
@@ -27,17 +27,17 @@
     },
     "BUFFER_PROFILE": {
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "pool":"ingress_lossless_pool",
             "size":"0",
             "dynamic_th":"3"
         },
         "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "pool":"egress_lossless_pool",
             "size":"0",
             "static_th":"12766208"
         },
         "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "pool":"egress_lossy_pool",
             "size":"1518",
             "dynamic_th":"3"
         }

diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
@@ -34,17 +34,17 @@
     },
     "BUFFER_PROFILE": {
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "pool":"ingress_lossless_pool",
             "size":"0",
             "dynamic_th":"3"
         },
         "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "pool":"egress_lossless_pool",
             "size":"0",
             "static_th":"12766208"
         },
         "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "pool":"egress_lossy_pool",
             "size":"1518",
             "dynamic_th":"3"
         }

diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
@@ -34,17 +34,17 @@
     },
     "BUFFER_PROFILE": {
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "pool":"ingress_lossless_pool",
             "size":"0",
             "dynamic_th":"3"
         },
         "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "pool":"egress_lossless_pool",
             "size":"0",
             "static_th":"12766208"
         },
         "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "pool":"egress_lossy_pool",
             "size":"1518",
             "dynamic_th":"3"
         }

diff --git a/device/arista/x86_64-arista_7050_qx32/platform_asic b/device/arista/x86_64-arista_7050_qx32/platform_asic
@@ -0,0 +1 @@
+broadcom
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2
@@ -38,17 +38,17 @@
     },
     "BUFFER_PROFILE": {
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "pool":"ingress_lossless_pool",
             "size":"0",
             "dynamic_th":"3"
         },
         "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "pool":"egress_lossless_pool",
             "size":"0",
             "static_th":"12766208"
         },
         "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "pool":"egress_lossy_pool",
             "size":"1518",
             "dynamic_th":"3"
         }