Merge branch 'sonic-net:master' into paravind/ss_zmq

Author: prabhataravind

.azure-pipelines/azure-pipelines-build-vs-and-test.yml

@@ -0,0 +1,125 @@
+pr: none
+trigger: none
+
+
+name: $(TeamProject)_$(Build.DefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
+
+resources:
+  repositories:
+  - repository: sonic-mgmt
+    type: github
+    name: sonic-net/sonic-mgmt
+    ref: master
+    endpoint: sonic-net
+  - repository: buildimage
+    type: github
+    name: sonic-net/sonic-buildimage
+    endpoint: sonic-net
+    ref: master
+
+
+variables:
+- template: .azure-pipelines/azure-pipelines-repd-build-variables.yml@buildimage
+- template: .azure-pipelines/template-variables.yml@buildimage
+- name: CACHE_MODE
+  value: rcache
+- name: ENABLE_FIPS
+  value: y
+- name: BUILD_BRANCH
+  ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+    value: $(System.PullRequest.TargetBranch)
+  ${{ else }}:
+    value: $(Build.SourceBranchName)
+
+
+parameters:
+  - name: SUBMODULE
+    type: string
+    default: ' '
+
+  - name: COMMIT_ID
+    type: string
+    default: ' '
+
+  - name: MGMT_BRANCH
+    type: string
+    default: 'master'
+
+  - name: TOPOLOGY
+    type: string
+    default: ''
+    values:
+      - t0
+      - t0-64-32
+      - t1-lag
+      - multi-asic-t1-lag
+      - dualtor
+      - dpu
+
+  - name: DEPLOY_MG_EXTRA_PARAMS
+    type: string
+    default: ' '
+
+  - name: SCRIPTS
+    type: string
+    default: ' '
+
+  - name: FEATURES
+    type: string
+    default: ' '
+
+  - name: MIN_WORKER
+    type: string
+    default: '1'
+
+  - name: MAX_WORKER
+    type: string
+    default: '1'
+
+  - name: STOP_ON_FAILURE
+    type: string
+    default: 'False'
+    values:
+      - 'True'
+      - 'False'
+
+stages:
+  - stage: BuildVS
+    pool: sonicbld-1es
+    jobs:
+    - template: azure-pipelines-build.yml
+      parameters:
+        buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) BUILD_MULTIASIC_KVM=y INCLUDE_DHCP_SERVER=y ${{ variables.  VERSION_CONTROL_OPTIONS }}'
+        jobGroups:
+        - name: vs
+        SUBMODULE: ${{ parameters.SUBMODULE }}
+        COMMIT_ID: ${{ parameters.COMMIT_ID }}
+
+  - stage: Test
+    dependsOn: BuildVS
+    condition: and(succeeded(), and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues')))
+    variables:
+    - group: SONiC-Elastictest
+    - name: inventory
+      value: veos_vtb
+    - name: testbed_file
+      value: vtestbed.yaml
+
+    jobs:
+    - job: KVMTEST
+      displayName: "kvmtest by Elastictest"
+      timeoutInMinutes: 240
+      continueOnError: false
+      pool: sonic-ubuntu-1c
+      steps:
+      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
+        parameters:
+          TOPOLOGY: ${{ parameters.TOPOLOGY }}
+          MIN_WORKER: ${{ parameters.MIN_WORKER }}
+          MAX_WORKER: ${{ parameters.MAX_WORKER }}
+          KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: ${{ parameters.MGMT_BRANCH }}
+          SCRIPTS: ${{ parameters.SCRIPTS }}
+          FEATURES: ${{ parameters.FEATURES }}
+          DEPLOY_MG_EXTRA_PARAMS: ${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}
+          STOP_ON_FAILURE: ${{ parameters.STOP_ON_FAILURE }}

.azure-pipelines/azure-pipelines-build.yml

@@ -19,13 +19,21 @@ parameters:
 - name: 'qemuOrCrossBuild'
   type: boolean
   default: false
+- name: SUBMODULE
+  type: string
+  default: ''
+- name: COMMIT_ID
+  type: string
+  default: ''
 
 jobs:
 - template: azure-pipelines-image-template.yml
   parameters:
     jobFilters: ${{ parameters.jobFilters }}
     preSteps: ${{ parameters.preSteps }}
     postSteps: ${{ parameters.postSteps }}
+    SUBMODULE: ${{ parameters.SUBMODULE }}
+    COMMIT_ID: ${{ parameters.COMMIT_ID }}
     jobVariables:
       PLATFORM_AZP: $(GROUP_NAME)
       PLATFORM_ARCH: amd64

.azure-pipelines/azure-pipelines-image-template.yml

@@ -19,6 +19,12 @@ parameters:
 - name: jobVariables
   type: object
   default: []
+- name: SUBMODULE
+  type: string
+  default: ''
+- name: COMMIT_ID
+  type: string
+  default: ''
 jobs:
 - template: azure-pipelines-job-groups.yml
   parameters:
@@ -42,6 +48,17 @@ jobs:
         fetchDepth: 0
         condition: and(succeeded(), eq(variables.SKIP_CHECKOUT, ''))
         displayName: 'Checkout code'
+      - script: |
+          if [ -n "${{ parameters.COMMIT_ID }}" ]; then
+            if [ -n "${{ parameters.SUBMODULE }}" ]; then
+              git submodule update --init --recursive
+              cd src/${{ parameters.SUBMODULE }}
+            fi
+            git checkout ${{ parameters.COMMIT_ID }}
+          else
+            echo "No specific commit id provided, checkout to latest commit"
+          fi
+        displayName: 'Checkout commit'
       - script: |
           set -x
           sudo setfacl -R -b $(Agent.BuildDirectory)

.azure-pipelines/azure-pipelines-repd-build-variables.yml

@@ -1,2 +1,2 @@
 variables:
-  VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
+  VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=py2,py3,web,git,docker'

README.md

@@ -211,7 +211,6 @@ The supported ASIC vendors are:
 * PLATFORM=broadcom
 * PLATFORM=marvell
 * PLATFORM=mellanox
-* PLATFORM=cavium
 * PLATFORM=centec
 * PLATFORM=nephos
 * PLATFORM=nvidia-bluefield

azure-pipelines.yml

@@ -109,6 +109,7 @@ stages:
   - job:
     pool: sonictest
     displayName: "vstest"
+    condition: false # agent pool don't work. disable this job to unblock PRs.
     timeoutInMinutes: 60
     steps:
     - template: .azure-pipelines/cleanup.yml