[Mellanox] SFP counter fix for multi-ASIC

.azure-pipelines/azure-pipelines-UpgrateVersion.yml

@@ -114,7 +114,7 @@ stages:
         echo "artifacts$artifacts"
         cp -r $(Pipeline.Workspace)/sonic-buildimage.${default_platform}/target/versions target/
         make freeze FREEZE_VERSION_OPTIONS=-r
-        find files/build/versions
+        find -L files/build/versions
         ordered_artifacts=$(echo "$artifacts" | grep -v -E "arm64|armhf" && echo "$artifacts" | grep -E "arm64|armhf")
         for artifact in $ordered_artifacts
         do
@@ -124,14 +124,14 @@ stages:
           [[ "$artifact" == *arm64* || "$artifact" == *armhf* ]] && OPTIONS="-d"
           make freeze FREEZE_VERSION_OPTIONS="$OPTIONS"
         done
-        git diff files/build/versions
+        git diff files/build/versions-public
       displayName: 'Freeze Versions'
     - script: |
         if [ -z "$GIT_USER" ]; then
           echo "Skipped to send the pull request, GIT_USER not set."
           exit 0
         fi
-        GIT_STATUS=$(git status  --porcelain files/build/versions)
+        GIT_STATUS=$(git status  --porcelain files/build/versions-public)
         if [ -z "$GIT_STATUS" ]; then
           echo "Skipped to send the pull request, no version change in files/build/versions"
           exit 0
@@ -151,8 +151,8 @@ stages:
 
         git config user.name $GIT_USER
         git config credential.https://github.com.username $GIT_USER
-        git add files/build/versions
-        git commit -m "[ci/build]: Upgrade SONiC package versions"
+        git add files/build/versions-public
+        git commit -s -m "[ci/build]: Upgrade SONiC package versions"
         git checkout -b $BRANCH_NAME
         git remote add remote https://github.com/$GIT_USER/$GIT_REPO
         git push remote HEAD:refs/heads/$BRANCH_NAME -f

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

@@ -0,0 +1,50 @@
+pr: none
+trigger: none
+
+
+name: $(TeamProject)_$(Build.DefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
+
+resources:
+  repositories:
+  - 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: ' '
+
+
+stages:
+  - stage: BuildAlpineVS
+    pool: sonicso1ES-amd64
+    jobs:
+    - template: azure-pipelines-build.yml
+      parameters:
+        buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
+        jobGroups:
+        - name: alpinevs
+        SUBMODULE: ${{ parameters.SUBMODULE }}
+        COMMIT_ID: ${{ parameters.COMMIT_ID }}

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

@@ -36,7 +36,7 @@ jobs:
       - script: |
           [ -n "$OVERRIDE_BUILD_OPTIONS" ] && OVERRIDE_BUILD_OPTIONS=$(OVERRIDE_BUILD_OPTIONS)
           BUILD_OPTIONS="$(BUILD_OPTIONS) $OVERRIDE_BUILD_OPTIONS"
-          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-prestera-armhf|marvell-prestera-arm64|vpp)$"; then
+          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-prestera-armhf|marvell-prestera-arm64|vpp|nvidia-bluefield)$"; then
             CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
             BUILD_OPTIONS="$BUILD_OPTIONS $CACHE_OPTIONS"
           fi

.azure-pipelines/baseline_test/baseline.test.buildimage.yml

@@ -76,11 +76,10 @@ stages:
     jobs:
     - template: .azure-pipelines/pr_test_template.yml@sonic-mgmt
       parameters:
-        GLOBAL_PARAMS:
-          BUILD_REASON: ${{ parameters.BUILD_REASON }}
-          RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
-          STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
-          TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
+        BUILD_REASON: ${{ parameters.BUILD_REASON }}
+        RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
+        STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
+        TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
         CHECKOUT_SONIC_MGMT: ${{ parameters.CHECKOUT_SONIC_MGMT }}
 
   - stage: Test_round_2
@@ -90,11 +89,10 @@ stages:
     jobs:
     - template: .azure-pipelines/pr_test_template.yml@sonic-mgmt
       parameters:
-        GLOBAL_PARAMS:
-          BUILD_REASON: ${{ parameters.BUILD_REASON }}
-          RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
-          STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
-          TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
+        BUILD_REASON: ${{ parameters.BUILD_REASON }}
+        RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
+        STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
+        TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
         CHECKOUT_SONIC_MGMT: ${{ parameters.CHECKOUT_SONIC_MGMT }}
 
   - stage: Test_round_3
@@ -104,11 +102,10 @@ stages:
     jobs:
     - template: .azure-pipelines/pr_test_template.yml@sonic-mgmt
       parameters:
-        GLOBAL_PARAMS:
-          BUILD_REASON: ${{ parameters.BUILD_REASON }}
-          RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
-          STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
-          TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
+        BUILD_REASON: ${{ parameters.BUILD_REASON }}
+        RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
+        STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
+        TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
         CHECKOUT_SONIC_MGMT: ${{ parameters.CHECKOUT_SONIC_MGMT }}
 
   - stage: Test_round_4
@@ -118,9 +115,8 @@ stages:
     jobs:
     - template: .azure-pipelines/pr_test_template.yml@sonic-mgmt
       parameters:
-        GLOBAL_PARAMS:
-          BUILD_REASON: ${{ parameters.BUILD_REASON }}
-          RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
-          STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
-          TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
+        BUILD_REASON: ${{ parameters.BUILD_REASON }}
+        RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
+        STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
+        TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
         CHECKOUT_SONIC_MGMT: ${{ parameters.CHECKOUT_SONIC_MGMT }}

.azure-pipelines/docker-sonic-slave-template.yml

@@ -53,11 +53,14 @@ jobs:
   - bash: |
       set -ex
       build_options="$(VERSION_CONTROL_OPTIONS)"
-      image_tag=$(BLDENV=${{ parameters.dist }} make -f Makefile.work showtag $build_options PLATFORM=generic PLATFORM_ARCH=${{ parameters.arch }} | grep sonic-slave | tail -n 1)
+      tags=$(BLDENV=${{ parameters.dist }} make -f Makefile.work showtag $build_options PLATFORM=generic PLATFORM_ARCH=${{ parameters.arch }} | grep sonic-slave | tail -n 2)
+      image_tag=$(printf '%s\n' "$tags" | tail -n 1)
       image_latest=$(echo $(echo $image_tag | awk -F: '{print$1}'):latest)
+      user_image_tag=$(printf '%s\n' "$tags" | head -n 1)
       image_branch=$(echo $(echo $image_tag | awk -F: '{print$1}'):$(Build.SourceBranchName))
       image_branch_arch=$(echo $(echo $image_tag | awk -F: '{print$1}'):$(Build.SourceBranchName)-${{ parameters.arch }})
       docker rmi $image_tag || true
+      docker rmi $user_image_tag || true
 
       if [[ "$(Build.Reason)" =~ [a-zA-Z]*CI ]] && docker pull ${{ parameters.registry_url }}/${image_tag};then
         exit 0
@@ -70,6 +73,8 @@ jobs:
 
       docker tag ${image_tag} ${REGISTRY_SERVER}/${image_tag}
       docker push ${REGISTRY_SERVER}/${image_tag}
+      docker tag ${user_image_tag} ${REGISTRY_SERVER}/${user_image_tag}
+      docker push ${REGISTRY_SERVER}/${user_image_tag}
       docker tag ${image_tag} ${REGISTRY_SERVER}/${image_branch_arch}
       docker push ${REGISTRY_SERVER}/${image_branch_arch}
       if [[ "${{ parameters.arch }}" == "amd64" ]];then

.github/copilot-instructions.md

@@ -0,0 +1,107 @@
+# Copilot Instructions for sonic-buildimage
+
+## Project Overview
+
+sonic-buildimage is the master build system for SONiC (Software for Open Networking in the Cloud). It produces ONIE-compatible network operating system installer images for network switches across multiple ASIC platforms (Broadcom, Mellanox/NVIDIA, Marvell, etc.). This is the central repo that pulls in all other SONiC components as submodules and builds them into a complete NOS image.
+
+## Architecture
+
+```
+sonic-buildimage/
+├── device/           # Platform-specific device configurations and plugins
+├── dockers/          # Dockerfile definitions for all SONiC containers
+├── files/            # Configuration files, scripts, and templates
+├── installer/        # ONIE installer scripts
+├── platform/         # Platform-specific build rules and configurations
+├── rules/            # Makefile rules for building individual components
+├── scripts/          # Build helper scripts
+├── sonic-slave-*/    # Build environment container definitions (per Debian version)
+├── src/              # Source code and submodules for SONiC components
+├── .azure-pipelines/ # CI/CD pipeline definitions
+├── Makefile          # Top-level build entry point
+└── .github/          # GitHub Actions and PR templates
+```
+
+### Key Concepts
+- **Rules system**: Each component has a `.mk` file in `rules/` defining how to build it
+- **Docker containers**: SONiC services run in Docker containers defined in `dockers/`
+- **Platform abstraction**: `device/` and `platform/` directories abstract hardware differences
+- **Build slaves**: Builds run inside Debian-versioned containers (bookworm, bullseye, etc.)
+- **Submodules**: Most SONiC components are git submodules under `src/`
+
+## Language & Style
+
+- **Primary languages**: Makefile, Shell (bash), Python, Jinja2 templates
+- **Makefile style**: Use tabs for indentation in Makefiles (GNU Make requirement)
+- **Shell scripts**: Use `#!/bin/bash`, 4-space indentation
+- **Python**: Follow PEP 8, 4-space indentation
+- **Naming**: Use snake_case for variables and functions in shell/Python; UPPER_CASE for Make variables
+
+## Build Instructions
+
+```bash
+# Clone with submodules
+git clone --recurse-submodules https://github.com/sonic-net/sonic-buildimage.git
+cd sonic-buildimage
+
+# Initialize build environment
+make init
+
+# Configure for a specific platform
+make configure PLATFORM=vs  # Virtual Switch for testing
+# Other platforms: broadcom, mellanox, marvell-teralynx, etc.
+
+# Build the image
+make SONIC_BUILD_JOBS=4 target/sonic-vs.img.gz
+
+# Build specific component
+make target/debs/bookworm/swss_1.0.0_amd64.deb
+```
+
+### Build Environment Requirements
+- Multiple CPU cores, 8+ GiB RAM, 300+ GiB disk
+- Docker installed and running
+- KVM virtualization support (for some builds)
+
+## Testing
+
+- **VS (Virtual Switch)** platform is the primary testing platform
+- CI runs on Azure Pipelines (`.azure-pipelines/`)
+- Test images are built with `PLATFORM=vs`
+- Integration tests run against VS images in sonic-mgmt repo
+- Use `pytest.ini` at the root for Python test configuration
+
+## PR Guidelines
+
+- **Commit format**: `[component/folder]: Description of changes`
+- **Signed-off-by**: All commits MUST include `Signed-off-by: Your Name <email>` (DCO requirement)
+- **CLA**: Sign the Linux Foundation EasyCLA before contributing
+- **Single logical change per PR**: Isolate each commit to one component/bugfix/feature
+- **Submodule updates**: When updating a submodule, reference the PR in the submodule repo
+- **PR description**: Include what changed, why, and how to test
+
+## Common Patterns
+
+- **Adding a new package**: Create a `.mk` file in `rules/`, add source in `src/`
+- **Adding a Docker container**: Create Dockerfile in `dockers/`, add build rule in `rules/`
+- **Platform support**: Add platform config in `device/<vendor>/`, build rules in `platform/`
+- **Version pinning**: Dependencies are version-pinned in rules files
+- **Build flags**: Use `ENABLE_*` and `INCLUDE_*` variables to toggle features
+
+## Dependencies
+
+- All SONiC repos are submodules (sonic-swss, sonic-sairedis, sonic-utilities, etc.)
+- Debian base system (bookworm/bullseye)
+- Docker for containerized builds
+- Azure Pipelines for CI/CD
+
+## Gotchas
+
+- **Build times**: Full builds take 2-6 hours; use `SONIC_BUILD_JOBS` to parallelize
+- **Disk space**: Builds require 100+ GiB; clean with `make clean` or `make reset`
+- **Submodule versions**: Always check that submodule pins are correct before building
+- **Docker cache**: Build uses Docker layer caching; `make clean` to force rebuild
+- **Branch compatibility**: Component branches must match buildimage branch (e.g., master ↔ master)
+- **Make variables**: Many build options are controlled by variables in `rules/config`
+- **Platform differences**: Some features are platform-specific; check `rules/config` for `ENABLE_*` flags
+- **Do NOT modify files in `src/` directly**: Changes should go to the respective submodule repos

.gitmodules

@@ -145,3 +145,6 @@
 [submodule "src/supervisor"]
 	path = src/supervisor
 	url = https://github.com/Supervisor/supervisor
+[submodule "platform/alpinevs"]
+	path = platform/alpinevs
+	url = https://github.com/sonic-net/sonic-alpine/