Merge branch '202505' of https://github.com/sonic-net/sonic-buildimage into 202506

Author: mssonicbld

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

@@ -121,7 +121,7 @@ jobs:
 
     buildSteps:
       - template: .azure-pipelines/template-skipvstest.yml@buildimage
-      - template: .azure-pipelines/template-daemon.yml@buildimage
+      - template: template-daemon.yml
       - bash: |
           set -ex
           if echo $(GROUP_NAME) | grep mellanox; then

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

@@ -85,6 +85,29 @@ jobs:
           BUILD_REASON=$(Build.Reason)
           echo "Build.Reason = $BUILD_REASON"
           echo "Build.DefinitionName = $BUILD_DEFINITIONNAME"
+
+          if [[ "$BUILD_REASON" == "PullRequest" ]]; then
+            echo "Checking for changes to dockers/docker-ptf/Dockerfile.j2 in PR..."
+            # Get the target branch and check for changes
+            TARGET_BRANCH="origin/$(System.PullRequest.TargetBranch)"
+            echo "Comparing against target branch: $TARGET_BRANCH"
+            # Fetch target branch to ensure we have the latest
+            git fetch origin $(System.PullRequest.TargetBranch)
+            # Check if docker-ptf Dockerfile.j2 has changes
+            # NOTE: The PTF_MODIFIED template parameter is of type string
+            # Ensure to set it to "True" or "False" (not boolean true/false)
+            if git diff --name-only $TARGET_BRANCH...HEAD | grep -q "dockers/docker-ptf/Dockerfile.j2"; then
+              echo "docker-ptf/Dockerfile.j2 has been modified in this PR"
+              echo "##vso[task.setvariable variable=PTF_MODIFIED;isOutput=true]True"
+            else
+              echo "docker-ptf/Dockerfile.j2 has not been modified in this PR"
+              echo "##vso[task.setvariable variable=PTF_MODIFIED;isOutput=true]False"
+            fi
+          else
+            echo "Not a PR build, setting PTF_MODIFIED to false"
+            echo "##vso[task.setvariable variable=PTF_MODIFIED;isOutput=true]False"
+          fi
+
           if [[ "$BUILD_REASON" != "PullRequest" && "$BUILD_DEFINITIONNAME" == "Azure.sonic-buildimage.official.vs" ]]
           then
             PORT=443
@@ -103,6 +126,7 @@ jobs:
           mv target/* $(Build.ArtifactStagingDirectory)/target/
         env:
           REGISTRY_PASSWD: $(REGISTRY_PASSWD)
+        name: PublishAndSetPtfTag
         displayName: Publish to Docker Registry and Copy Artifacts
         condition: always()
       - publish:  $(Build.ArtifactStagingDirectory)

.azure-pipelines/template-daemon.yml

@@ -5,18 +5,14 @@ steps:
       do
         sleep 120
         now=$(date +%s)
-        pids=$(ps -C docker-buildx -o pid,etime,args | grep "docker-buildx buildx build" | awk '{print $1}')
+        pids=$(ps -C docker -o pid,etime,args | grep "docker build" | cut -d" " -f2)
         for pid in $pids
         do
-          start_ticks=$(awk '{print $22}' /proc/$pid/stat)
-          boot_time=$(awk '/btime/ {print $2}' /proc/stat)
-          hertz=$(getconf CLK_TCK)
-          start_time=$((boot_time + start_ticks / hertz))
-          ts=$(date -d "@$((now - start_time))" +%s)
-
-          if [[ $ts -gt $(DOCKER_BUILD_TIMEOUT) ]]; then
+          start=$(date --date="$(ls -dl /proc/$pid --time-style full-iso | awk '{print$6,$7}')" +%s)
+          time_s=$(($now-$start))
+          if [[ $time_s -gt $(DOCKER_BUILD_TIMEOUT) ]]; then
             echo =========== $(date +%F%T) $time_s &>> target/daemon.log
-            ps -p $pid -o pid,etime,args ww &>> target/daemon.log
+            ps $pid &>> target/daemon.log
             sudo kill $pid
           fi
         done

azure-pipelines.yml

@@ -109,12 +109,29 @@ stages:
     value: veos_vtb
   - name: testbed_file
     value: vtestbed.csv
+  - name: PTF_MODIFIED
+    value: $[ coalesce(stageDependencies.BuildVS.vs.outputs['PublishAndSetPtfTag.PTF_MODIFIED'], stageDependencies.BuildVS.vs.outputs['script.PTF_MODIFIED'], stageDependencies.BuildVS.vs.outputs['script1.PTF_MODIFIED'], 'False') ]
 
 # For every test job:
 # continueOnError: false means it's a required test job and will block merge if it fails
 # continueOnError: true means it's an optional test job and will not block merge even though it fails(unless a required test job depends on its result)
 
   jobs:
+  - job: debug_variables
+    pool: sonictest
+    displayName: "Debug PTF_MODIFIED Variable"
+    steps:
+    - script: |
+        echo "PTF_MODIFIED variable value: $(PTF_MODIFIED)"
+        echo "Debug: Checking if PTF_MODIFIED is being passed correctly from BuildVS stage"
+        if [ "$(PTF_MODIFIED)" = "True" ]; then
+          echo "SUCCESS: PTF_MODIFIED is True"
+        elif [ "$(PTF_MODIFIED)" = "False" ]; then
+          echo "INFO: PTF_MODIFIED is False"
+        else
+          echo "ERROR: PTF_MODIFIED has unexpected value: $(PTF_MODIFIED)"
+        fi
+      displayName: "Debug PTF_MODIFIED Variable"
   - job:
     pool: sonictest
     displayName: "vstest"
@@ -210,6 +227,7 @@ stages:
           MAX_WORKER: $(INSTANCE_NUMBER)
           KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
           MGMT_BRANCH: $(BUILD_BRANCH)
+          PTF_MODIFIED: ${{ eq(variables['PTF_MODIFIED'], 'true') }}
 
   - job: impacted_area_t0_2vlans_elastictest
     displayName: "impacted-area-kvmtest-t0-2vlans by Elastictest"
@@ -237,6 +255,7 @@ stages:
           DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
           KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
           MGMT_BRANCH: $(BUILD_BRANCH)
+          PTF_MODIFIED: ${{ eq(variables['PTF_MODIFIED'], 'true') }}
 
   - job: impacted_area_t1_lag_elastictest
     displayName: "impacted-area-kvmtest-t1-lag by Elastictest"
@@ -265,6 +284,7 @@ stages:
           MAX_WORKER: $(INSTANCE_NUMBER)
           KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
           MGMT_BRANCH: $(BUILD_BRANCH)
+          PTF_MODIFIED: ${{ eq(variables['PTF_MODIFIED'], 'true') }}
 
   - job: impacted_area_dualtor_elastictest
     displayName: "impacted-area-kvmtest-dualtor by Elastictest"
@@ -294,6 +314,7 @@ stages:
           COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
           KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
           MGMT_BRANCH: $(BUILD_BRANCH)
+          PTF_MODIFIED: ${{ eq(variables['PTF_MODIFIED'], 'true') }}
 
   - job: impacted_area_multi_asic_elastictest
     displayName: "impacted-area-kvmtest-multi-asic-t1 by Elastictest"
@@ -321,6 +342,7 @@ stages:
           NUM_ASIC: 4
           KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
           MGMT_BRANCH: $(BUILD_BRANCH)
+          PTF_MODIFIED: ${{ eq(variables['PTF_MODIFIED'], 'true') }}
 
   - job: impacted_area_t0_sonic_elastictest
     displayName: "impacted-area-kvmtest-t0-sonic by Elastictest"
@@ -354,6 +376,7 @@ stages:
             {"name": "bgp/test_bgp_fact.py", "param": "--neighbor_type=sonic --enable_macsec --macsec_profile=128_SCI,256_XPN_SCI"},
             {"name": "macsec", "param": "--neighbor_type=sonic --enable_macsec --macsec_profile=128_SCI,256_XPN_SCI"}
             ]'
+          PTF_MODIFIED: ${{ eq(variables['PTF_MODIFIED'], 'true') }}
 
   - job: impacted_area_dpu_elastictest
     displayName: "impacted-area-kvmtest-dpu by Elastictest"
@@ -383,3 +406,4 @@ stages:
           SPECIFIC_PARAM: '[
             {"name": "dash/test_dash_vnet.py", "param": "--skip_dataplane_checking"}
             ]'
+          PTF_MODIFIED: ${{ eq(variables['PTF_MODIFIED'], 'true') }}

device/arista/x86_64-arista_7060x6_16pe_384c/sensors.conf

@@ -1,14 +1,40 @@
+bus "i2c-16" "SCD 0000:03:00.0 SMBus master 1 bus 3"
 bus "i2c-19" "SCD 0000:06:00.0 SMBus master 0 bus 0"
+bus "i2c-35" "SCD 0000:06:00.0 SMBus master 2 bus 4"
+bus "i2c-37" "SCD 0000:05:00.0 SMBus master 0 bus 0"
+
+chip "k10temp-pci-00c3"
+    label temp1 "Cpu temp sensor"
 
 chip "max6581-i2c-19-4d"
+    label temp1 "Switch Card temp sensor"
+    label temp2 "TH5 PCB Left"
+    label temp3 "TH5 PCB Right"
+    label temp4 "Inlet Ambiant Air"
     ignore temp5
     ignore temp6
+    label temp7 "TH5 Diode 1"
+    label temp8 "TH5 Diode 2"
 
 chip "nvme-pci-0400"
-    # TODO: sensors complaining about tempX_min and tempX_max
     ignore temp2
     ignore temp3
     ignore temp4
     ignore temp5
     ignore temp6
     ignore temp7
+
+chip "pmbus-i2c-35-10"
+    label temp1 "Power supply 1 internal sensor"
+    ignore temp2
+
+chip "pmbus-i2c-35-12"
+    label temp1 "Power supply 2 internal sensor"
+    ignore temp2
+
+chip "tmp75-i2c-16-48"
+    label temp1 "Outlet"
+
+chip "tmp75-i2c-37-4a"
+    label temp1 "Port Card"
+

device/arista/x86_64-arista_7060x6_16pe_384c_b/sensors.conf

@@ -0,0 +1 @@
+../x86_64-arista_7060x6_16pe_384c/sensors.conf

device/arista/x86_64-arista_7060x6_16pe_384c_b/sensors.conf

@@ -63,6 +63,9 @@ RUN apt update &&            \
         libwrap0            \
         libatomic1
 
+# Security fixes: upgrade vulnerable base packages (S360 scan remediation)
+RUN apt-get update && apt-get upgrade -y
+
 # Add a config file to allow pip to install packages outside of apt/the Debian repos
 COPY ["pip.conf", "/etc/pip.conf"]
 

dockers/docker-base-bookworm/Dockerfile.j2

@@ -199,7 +199,29 @@ dependent_startup_wait_for=rsyslogd:running {% if delay_non_critical_daemon %}de
 
 {% if not skip_thermalctld %}
 [program:thermalctld]
-command={% if API_VERSION == 3 and 'thermalctld' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/thermalctld
+{% set base_command = (
+    "python3 /usr/local/bin/thermalctld"
+    if API_VERSION == 3 and 'thermalctld' not in python2_daemons
+    else "python2 /usr/local/bin/thermalctld"
+) %}
+{% set options = "" -%}
+
+{% if thermalctld is defined %}
+    {% if thermalctld.thermal_monitor_initial_interval is defined and thermalctld.thermal_monitor_initial_interval is not none %}
+        {%- set options = options + " --thermal-monitor-initial-interval " + thermalctld.thermal_monitor_initial_interval|string %}
+    {% endif -%}
+
+    {% if thermalctld.thermal_monitor_update_interval is defined and thermalctld.thermal_monitor_update_interval is not none %}
+        {%- set options = options + " --thermal-monitor-update-interval " + thermalctld.thermal_monitor_update_interval|string %}
+    {% endif -%}
+
+    {% if thermalctld.thermal_monitor_update_elapsed_threshold is defined and thermalctld.thermal_monitor_update_elapsed_threshold is not none %}
+        {%- set options = options + " --thermal-monitor-update-elapsed-threshold " + thermalctld.thermal_monitor_update_elapsed_threshold|string %}
+    {% endif -%}
+{% endif -%}
+
+{%- set command = base_command ~ options %}
+command={{ command }}
 priority=10
 autostart=false
 autorestart=unexpected