Merge branch 'master' into sensormon

Author: bmridul

.azure-pipelines/dpkg-cache-cleanup.yml

@@ -15,13 +15,34 @@ trigger: none
 pr: none
 
 jobs:
-- job: Build
+- job: Amd
   pool: sonicbld
   timeoutInMinutes: 5
   steps:
   - checkout: none
   - script: |
-      set -xe
+      df -h
       sudo find /nfs/dpkg_cache/ -name *.tgz -mtime +30 -type f -delete
+      df -h
     displayName: clean dpkg cache
-    
+- job: Armhf
+  pool: sonicbld-armhf
+  timeoutInMinutes: 5
+  steps:
+  - checkout: none
+  - script: |
+      df -h
+      sudo find /nfs/dpkg_cache/ -name *.tgz -mtime +30 -type f -delete
+      df -h
+    displayName: clean dpkg cache
+- job: Arm64
+  pool: sonicbld-arm64
+  timeoutInMinutes: 5
+  steps:
+  - checkout: none
+  - script: |
+      df -h
+      sudo find /nfs/dpkg_cache/ -name *.tgz -mtime +30 -type f -delete
+      df -h
+    displayName: clean dpkg cache
+

.github/workflows/automerge_scan.yml

@@ -16,58 +16,74 @@ jobs:
         set -e
 
         echo ${TOKEN} | gh auth login --with-token
-        gh pr list -R sonic-net/sonic-buildimage -A mssonicbld --json additions,assignees,author,baseRefName,body,changedFiles,closed,closedAt,comments,commits,createdAt,deletions,files,headRefName,headRepository,headRepositoryOwner,id,isCrossRepository,isDraft,labels,latestReviews,maintainerCanModify,mergeCommit,mergeStateStatus,mergeable,mergedAt,mergedBy,milestone,number,potentialMergeCommit,projectCards,reactionGroups,reviewDecision,reviewRequests,reviews,state,statusCheckRollup,title,updatedAt,url > prs.log
+        gh pr list -R sonic-net/sonic-buildimage -A mssonicbld -L 100 -S "label:automerge" --json url,body,title,createdAt,labels,statusCheckRollup > prs.log
         cat prs.log | jq
     - name: Main
       run: |
         set -e
 
+        # PR merge run per 2 hours
+        # Other operation run per day.
+        # Cherry pick PR:
+        # more than 3 days, comment @author to check
+        # more than 10 days, stop comment.
+        # more than 28 days, comment @author PR will be closed
+        # more than 30 days, close PR
+        date_3d_ago=$(date --date "3 day ago" -u +"%FT%TZ")
+        date_10d_ago=$(date --date "10 day ago" -u +"%FT%TZ")
+        date_28d_ago=$(date --date "28 day ago" -u +"%FT%TZ")
+        date_30d_ago=$(date --date "30 day ago" -u +"%FT%TZ")
+        date_now=$(date -u +"%T")
+        operate=false
+        [[ "$date_now" < "02:00:00" ]] && operate=true
+
         count=$(cat prs.log | jq 'length')
         for ((i=0;i<$count;i++))
         do
           url=$(cat prs.log | jq -r ".[$i].url")
           body=$(cat prs.log | jq -r ".[$i].body")
           title=$(cat prs.log | jq -r ".[$i].title")
+          origin_pr_id=$(echo $title | grep -Eo "\[action\] \[PR:[0-9]*\]" | grep -Eo [0-9]* || true)
           created_at=$(cat prs.log | jq -r ".[$i].createdAt")
-          echo PR: $(($i+1))/$count, URL: $url, createdAt: $created_at, now: $(date -u +"%FT%TZ")
+          echo PR: $(($i+1))/$count, URL: $url, origin PR: $origin_pr_id, createdAt: $created_at, operate: $operate
           [[ "$url" == "" ]] && continue
           [[ $created_at > $(date --date "1 hour ago" -u +"%FT%TZ") ]] && continue
-          # only check automerge PR.
-          cat prs.log | jq -r ".[$i].labels[].name" | grep automerge || continue
 
           checks=$(cat prs.log | jq ".[$i].statusCheckRollup")
           checks_count=$(echo $checks | jq 'length')
-          echo Checks count: $checks_count
+          pr_success=true
           for ((j=0;j<$checks_count;j++))
           do
             check=$(echo $checks | jq ".[$j]")
-            state=$(echo $check | jq -r '.state')
+            status=$(echo $check | jq -r '.status')
             conclusion=$(echo $check | jq -r '.conclusion')
             name=$(echo $check | jq -r '.name')
 
             # EasyCLA success flag:  state=SUCCESS
             # Others success flag:   conclusion in SUCCESS,NEUTRAL
-            # Ignore Azure.sonic-buildimage stage check result. It may be set continueOnError
-            echo "$name" | grep "Azure.sonic-buildimage (" && continue
-            # rerun Azure.sonic-buildimage per day
-            if [[ "$name" == "Azure.sonic-buildimage" ]] && [[ "$conclusion" == "FAILURE" ]];then
-              completedAt=$(echo $check | jq -r '.completedAt')
-              [[ "$completedAt" < $(date --date "2 hour ago" -u +"%FT%TZ") ]] && [[ $(date -u +"%T") < "02:00:00" ]] && gh pr comment $url --body "/azp run Azure.sonic-buildimage"
-            fi
-            # Ignore Semgrep, it has issues.
-            [[ "$name" == "Semgrep" ]] && continue
-            if [[ "$state" == "SUCCESS" ]];then
-              # check pass
-              continue
-            elif [[ "$conclusion" == "SUCCESS" ]] || [[ "$conclusion" == "NEUTRAL" ]];then
-              # check pass
-              continue
-            else
-              echo "$url Check failed!!!"
-              echo $check | jq
-              continue 2
-            fi
+            # only check Azure.sonic-buildimage currently
+            echo "$name" | grep -v "Azure.sonic-buildimage" > /dev/null && continue
+            [[ "$status" != "COMPLETED" ]] && echo "$name: $status" && continue 2
+
+            success=true
+            ( [[ "$conclusion" == "FAILURE" ]] || [[ "$conclusion" == "CANCELLED" ]] ) && success=false && pr_success=false
+            ! $success && echo "FAIL: $name"
           done
+
+          # rerun Azure.sonic-buildimage per day
+          ! $pr_success && $operate && gh pr comment $url --body "/azp run Azure.sonic-buildimage"
+
+          # If auto cherry pick PRs failed, comment in original PR and close cherry pick PR
+          if [ -n "$origin_pr_id" ] && [[ $created_at < $date_3d_ago ]] && ! $pr_success;then
+            origin_pr_url=https://github.com/sonic-net/sonic-buildimage/pull/$origin_pr_id
+            author=$(gh pr view $origin_pr_url --json author | jq .author.login -r)
+            echo "Original author will check."
+            $operate && [[ $created_at > $date_10d_ago ]] && gh pr comment $origin_pr_url --body "@$author cherry pick PR didn't pass PR checker. Please check!!!<br>$url"
+            $operate && [[ $created_at < $date_28d_ago ]] && gh pr comment $origin_pr_url --body "@$author cherry pick PR didn't pass PR checker. Please check!!! Auto cherry pick PR will be closed in 2 days.<br>$url"
+            $operate && [[ $created_at < $date_30d_ago ]] && echo "$url Closed" && gh pr close $url
+          fi
+
+          ! $pr_success && continue
           # merge the PR
           echo ========Merging  PR========
           if echo $title | grep "^\[submodule\]";then
@@ -77,3 +93,4 @@ jobs:
           fi
           echo ========Finished PR========
         done
+

Makefile.work

@@ -537,6 +537,7 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                            SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD=$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) \
                            SONIC_INCLUDE_SYSTEM_TELEMETRY=$(INCLUDE_SYSTEM_TELEMETRY) \
                            INCLUDE_DHCP_RELAY=$(INCLUDE_DHCP_RELAY) \
+                           INCLUDE_DHCP_SERVER=$(INCLUDE_DHCP_SERVER) \
                            INCLUDE_MACSEC=$(INCLUDE_MACSEC) \
                            SONIC_INCLUDE_RESTAPI=$(INCLUDE_RESTAPI) \
                            SONIC_INCLUDE_MUX=$(INCLUDE_MUX) \

build_debian.sh

@@ -296,7 +296,7 @@ then
     install_kubernetes ${MASTER_KUBERNETES_VERSION}
 
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
-    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install hyperv-daemons gnupg xmlstarlet
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install hyperv-daemons gnupg xmlstarlet parted
     sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove gnupg
     sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/cri-dockerd.deb -fsSL \
         https://github.com/Mirantis/cri-dockerd/releases/download/v${MASTER_CRI_DOCKERD}/cri-dockerd_${MASTER_CRI_DOCKERD}.3-0.debian-${IMAGE_DISTRO}_amd64.deb

build_image.sh

@@ -139,23 +139,19 @@ elif [ "$IMAGE_TYPE" = "raw" ]; then
     ## Run the installer
     ## The 'build' install mode of the installer is used to generate this dump.
     sudo chmod a+x $tmp_output_onie_image
-    sudo ./$tmp_output_onie_image
+    sudo ./$tmp_output_onie_image || {
+        ## Failure during 'build' install mode of the installer results in an incomplete raw image.
+        ## Delete the incomplete raw image.
+        sudo rm -f $OUTPUT_RAW_IMAGE
+    }
     rm $tmp_output_onie_image
 
     [ -r $OUTPUT_RAW_IMAGE ] || {
         echo "Error : $OUTPUT_RAW_IMAGE not generated!"
         exit 1
     }
 
-    $GZ_COMPRESS_PROGRAM $OUTPUT_RAW_IMAGE
-
-    [ -r $OUTPUT_RAW_IMAGE.gz ] || {
-        echo "Error : $GZ_COMPRESS_PROGRAM $OUTPUT_RAW_IMAGE failed!"
-        exit 1
-    }
-
-    mv $OUTPUT_RAW_IMAGE.gz $OUTPUT_RAW_IMAGE
-    echo "The compressed raw image is in $OUTPUT_RAW_IMAGE"
+    echo "The raw image is in $OUTPUT_RAW_IMAGE"
 
 elif [ "$IMAGE_TYPE" = "kvm" ]; then
 

device/arista/x86_64-arista_7050dx4_32s/pcie.yaml

@@ -152,11 +152,6 @@
   id: '1466'
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
     Data Fabric: Device 18h; Function 6'
-- bus: '00'
-  dev: '18'
-  fn: '7'
-  id: '0001'
-  name: 'Host bridge: Arastra Inc. Device 0001'
 - bus: '01'
   dev: '00'
   fn: '0'

device/arista/x86_64-arista_7050px4_32s/pcie.yaml

@@ -152,11 +152,6 @@
   id: '1466'
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
     Data Fabric: Device 18h; Function 6'
-- bus: '00'
-  dev: '18'
-  fn: '7'
-  id: '0001'
-  name: 'Host bridge: Arastra Inc. Device 0001'
 - bus: '01'
   dev: '00'
   fn: '0'

device/arista/x86_64-arista_7050sx3_48c8/pcie.yaml

@@ -64,11 +64,6 @@
   id: '1578'
   name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Carrizo Platform
     Security Processor'
-- bus: '00'
-  dev: 09
-  fn: '0'
-  id: '0001'
-  name: 'Host bridge: Arastra Inc. Device 0001'
 - bus: '00'
   dev: 09
   fn: '2'

device/arista/x86_64-arista_7050sx3_48yc8/pcie.yaml

@@ -64,11 +64,6 @@
   id: '1578'
   name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Carrizo Platform
     Security Processor'
-- bus: '00'
-  dev: 09
-  fn: '0'
-  id: '0001'
-  name: 'Host bridge: Arastra Inc. Device 0001'
 - bus: '00'
   dev: 09
   fn: '2'

device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm

@@ -16,6 +16,8 @@ miim_intr_enable.0=0
 module_64ports.0=1
 multicast_l2_range.0=511
 oversubscribe_mode=1
+sai_tunnel_global_sip_mask_enable=1
+bcm_tunnel_term_compatible_mode=1
 parity_correction=1
 parity_enable=1
 pbmp_xport_xe.0=0x3ffffffffffffffffffffffffffffffffffffffe