[Micas]Add new platform m2-w6010

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

@@ -6,7 +6,7 @@ parameters:
   default: ''
 - name: 'buildOptions'
   type: string
-  default: 'SONIC_CONFIG_BUILD_JOBS=1'
+  default: 'SONIC_CONFIG_BUILD_JOBS=4'
 - name: 'preSteps'
   type: stepList
   default: []
@@ -111,6 +111,8 @@ jobs:
       - template: .azure-pipelines/template-skipvstest.yml@buildimage
       - template: .azure-pipelines/template-daemon.yml@buildimage
       - bash: |
+          patch -p1 < 0001-update-swss-main-cpp.patch
+          patch -p1 < 0002-update-swss-orch-h.patch
           set -ex
           if [ $(GROUP_NAME) == vs ]; then
             if [ $(dbg_image) == yes ]; then

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

@@ -54,7 +54,7 @@ jobs:
     postSteps:
       - script: |
           mkdir -p $(Build.ArtifactStagingDirectory)/target
-          mv target/* $(Build.ArtifactStagingDirectory)/target/
+          mv target/*.bin $(Build.ArtifactStagingDirectory)/target/
         displayName: Copy Artifacts
         condition: always()
       - publish:  $(Build.ArtifactStagingDirectory)

.gitignore

@@ -62,7 +62,7 @@ src/**/*.o
 platform/**/*.egg-info
 platform/**/*-none-any.whl
 platform/**/.pybuild
-platform/**/debian/*
+#platform/**/debian/*
 platform/**/build
 platform/**/*.ko
 platform/**/*.mod.c

0001-update-swss-main-cpp.patch

@@ -0,0 +1,42 @@
+--- sonic-buildimage-one/src/sonic-swss/orchagent/main.cpp	2023-06-07 15:33:45.516035105 +0800
++++ sonic-buildimage-two/src/sonic-swss/orchagent/main.cpp	2023-06-07 15:37:23.330336171 +0800
+@@ -569,7 +569,9 @@
+     attr.value.u64 = gSwitchId;
+     attrs.push_back(attr);
+
+-    if (gMySwitchType == "voq" || gMySwitchType == "fabric" || gMySwitchType == "chassis-packet")
++    /* centec create switch take longtime */
++    char *platform = getenv("platform");
++    if (gMySwitchType == "voq" || gMySwitchType == "fabric" || gMySwitchType == "chassis-packet" || (platform && strstr(platform, CENTEC_PLATFORM_SUBSTRING)))
+     {
+         /* We set this long timeout in order for orchagent to wait enough time for
+          * response from syncd. It is needed since switch create takes more time
+@@ -585,6 +587,10 @@
+         {
+             attr.value.u64 = (10 * SAI_REDIS_DEFAULT_SYNC_OPERATION_RESPONSE_TIMEOUT);
+         }
++        else if (platform && strstr(platform, CENTEC_PLATFORM_SUBSTRING))
++        {
++            attr.value.u64 = (10 * SAI_REDIS_DEFAULT_SYNC_OPERATION_RESPONSE_TIMEOUT);
++        }
+
+         attr.id = SAI_REDIS_SWITCH_ATTR_SYNC_OPERATION_RESPONSE_TIMEOUT;
+         status = sai_switch_api->set_switch_attribute(gSwitchId, &attr);
+@@ -607,11 +613,16 @@
+     }
+     SWSS_LOG_NOTICE("Create a switch, id:%" PRIu64, gSwitchId);
+
+-    if (gMySwitchType == "voq" || gMySwitchType == "fabric" || gMySwitchType == "chassis-packet")
++    if (gMySwitchType == "voq" || gMySwitchType == "fabric" || gMySwitchType == "chassis-packet" || (platform && strstr(platform, CENTEC_PLATFORM_SUBSTRING)))
+     {
+         /* Set syncd response timeout back to the default value */
+         attr.id = SAI_REDIS_SWITCH_ATTR_SYNC_OPERATION_RESPONSE_TIMEOUT;
+         attr.value.u64 = SAI_REDIS_DEFAULT_SYNC_OPERATION_RESPONSE_TIMEOUT;
++        /* centec platform set 3X default timeout*/
++        if (platform && strstr(platform, CENTEC_PLATFORM_SUBSTRING))
++        {
++            attr.value.u64 = (3 * SAI_REDIS_DEFAULT_SYNC_OPERATION_RESPONSE_TIMEOUT);
++        }
+         status = sai_switch_api->set_switch_attribute(gSwitchId, &attr);
+
+         if (status != SAI_STATUS_SUCCESS)

0002-update-swss-orch-h.patch

@@ -0,0 +1,10 @@
+--- sonic-buildimage-one/src/sonic-swss/orchagent/orch.h	2023-06-07 15:33:45.528034877 +0800
++++ sonic-buildimage-two/src/sonic-swss/orchagent/orch.h	2023-06-07 15:37:55.085516362 +0800
+@@ -40,6 +40,7 @@
+ #define NPS_PLATFORM_SUBSTRING  "nephos"
+ #define MRVL_PLATFORM_SUBSTRING "marvell"
+ #define CISCO_8000_PLATFORM_SUBSTRING "cisco-8000"
++#define CENTEC_PLATFORM_SUBSTRING "centec"
+
+ #define CONFIGDB_KEY_SEPARATOR "|"
+ #define DEFAULT_KEY_SEPARATOR  ":"

Makefile.work

@@ -332,6 +332,9 @@ DOCKER_BASE_BUILD = docker build --no-cache \
 DOCKER_BASE_PULL = docker pull \
 			$(REGISTRY_SERVER):$(REGISTRY_PORT)$(REGISTRY_SERVER_PATH)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
 
+DOCKER_BASE_PUSH = docker push \
+			$(REGISTRY_SERVER):$(REGISTRY_PORT)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
+
 DOCKER_BUILD = docker build --no-cache \
 	       --build-arg user=$(USER) \
 	       --build-arg uid=$(shell id -u) \
@@ -435,7 +438,9 @@ endif
 	          scripts/collect_docker_version_files.sh $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) target ; } } || \
 	    { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \
 	      $(DOCKER_BASE_BUILD) ; \
-	      scripts/collect_docker_version_files.sh $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) target ; }
+	      scripts/collect_docker_version_files.sh $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) target ; \
+	      docker tag $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) $(REGISTRY_SERVER):$(REGISTRY_PORT)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) ; \
+	      $(DOCKER_BASE_PUSH) ; }
 	@docker inspect --type image $(SLAVE_IMAGE):$(SLAVE_TAG) &> /dev/null || \
 	    { echo Image $(SLAVE_IMAGE):$(SLAVE_TAG) not found. Building... ; \
 	    $(DOCKER_BUILD) ; }
@@ -470,7 +475,9 @@ endif
 	          scripts/collect_docker_version_files.sh $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) target ; } } || \
 	    { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \
 	      $(DOCKER_BASE_BUILD) ; \
-	      scripts/collect_docker_version_files.sh $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) target ; }
+	      scripts/collect_docker_version_files.sh $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) target ; \
+	      docker tag $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) $(REGISTRY_SERVER):$(REGISTRY_PORT)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) ; \
+	      $(DOCKER_BASE_PUSH) ; }
 
 sonic-slave-build : sonic-slave-base-build
 	@echo Checking sonic-slave image: $(SLAVE_IMAGE):$(SLAVE_TAG)

azure-pipelines.yml

@@ -6,7 +6,6 @@
 trigger:
   branches:
     include:
-      - master
       - 202205
   paths:
     exclude:
@@ -15,9 +14,7 @@ trigger:
 pr:
   branches:
     include:
-      - master
       - 202205
-      - bullseye
   paths:
     exclude:
       - .github
@@ -51,7 +48,7 @@ stages:
   jobs:
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
-      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) BUILD_MULTIASIC_KVM=y ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) BUILD_MULTIASIC_KVM=y'
       jobGroups:
       - name: vs
 
@@ -61,167 +58,10 @@ stages:
   jobs:
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
-      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      buildOptions: 'USERNAME=admin ENABLE_DOCKER_BASE_PULL=y SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker SONIC_DPKG_CACHE_METHOD=rcache SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/centec-arm64 SONIC_BUILD_JOBS=$(nproc)'
       jobGroups:
-      - name: broadcom
-        variables:
-          dbg_image: yes
-          swi_image: yes
-          docker_syncd_rpc_image: yes
-          platform_rpc: brcm
-      - name: mellanox
-        variables:
-          dbg_image: yes
-          docker_syncd_rpc_image: yes
-          platform_rpc: mlnx
-      - name: marvell-armhf
-        pool: sonicbld-armhf
+      - name: centec-arm64
+        pool: sonicbld-arm64
         timeoutInMinutes: 1200
         variables:
-          PLATFORM_ARCH: armhf
-
-- 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.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
-        artifact: 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 apt-get update
-        sudo apt-get install libyang0.16 -y
-        sudo dpkg -i --force-confask,confnew ../libswsscommon_1.0.0_amd64.deb
-        sudo dpkg -i ../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: t0_elastictest
-    pool: ubuntu-20.04
-    displayName: "kvmtest-t0 by Elastictest"
-    timeoutInMinutes: 240
-    continueOnError: false
-    steps:
-    - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
-      parameters:
-        TOPOLOGY: t0
-        MIN_WORKER: $(T0_INSTANCE_NUM)
-        MAX_WORKER: $(T0_INSTANCE_NUM)
-        MGMT_BRANCH: "202205"
-
-  - job: t0_2vlans_elastictest
-    pool: ubuntu-20.04
-    displayName: "kvmtest-t0-2vlans by Elastictest"
-    timeoutInMinutes: 240
-    continueOnError: false
-    steps:
-    - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
-      parameters:
-        TOPOLOGY: t0
-        TEST_SET: t0-2vlans
-        MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM)
-        MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM)
-        DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
-        MGMT_BRANCH: "202205"
-
-  - job: t1_lag_elastictest
-    pool: ubuntu-20.04
-    displayName: "kvmtest-t1-lag by Elastictest"
-    timeoutInMinutes: 240
-    continueOnError: false
-    steps:
-    - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
-      parameters:
-        TOPOLOGY: t1-lag
-        MIN_WORKER: $(T1_LAG_INSTANCE_NUM)
-        MAX_WORKER: $(T1_LAG_INSTANCE_NUM)
-        MGMT_BRANCH: "202205"
-
-  - job: sonic_t0_elastictest
-    pool: ubuntu-20.04
-    displayName: "kvmtest-t0-sonic by Elastictest"
-    timeoutInMinutes: 240
-    continueOnError: false
-    steps:
-      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
-        parameters:
-          TOPOLOGY: t0-64-32
-          MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
-          MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
-          TEST_SET: t0-sonic
-          COMMON_EXTRA_PARAMS: "--neighbor_type=sonic "
-          VM_TYPE: vsonic
-          MGMT_BRANCH: "202205"
-
-  - job: dualtor_elastictest
-    pool: ubuntu-20.04
-    displayName: "kvmtest-dualtor-t0 by Elastictest"
-    timeoutInMinutes: 240
-    continueOnError: false
-    steps:
-      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
-        parameters:
-          TOPOLOGY: dualtor
-          MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
-          MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
-          COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
-          MGMT_BRANCH: "202205"
-
-  - job: multi_asic_elastictest
-    pool: ubuntu-20.04
-    displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
-    timeoutInMinutes: 1080
-    continueOnError: false
-    steps:
-      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
-        parameters:
-          TOPOLOGY: t1-8-lag
-          TEST_SET: multi-asic-t1-lag
-          MIN_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
-          MAX_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
-          NUM_ASIC: 4
-          MGMT_BRANCH: "202205"
+          PLATFORM_ARCH: arm64