temp PR multi-asic-ready-signal --> multi-asic

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

@@ -152,7 +152,7 @@ stages:
         git config user.name $GIT_USER
         git config credential.https://github.zerozr99.workers.dev.username $GIT_USER
         git add files/build/versions
-        git commit -m "[ci/build]: Upgrade SONiC package versions"
+        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-vs.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: BuildVS
+    pool: sonicso1ES-amd64
+    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 }}

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

@@ -182,7 +182,11 @@ jobs:
             fi
             if [ $(syncd_rpc_image) == yes ]; then
               make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/sonic-$(GROUP_NAME).bin
-              mv target/sonic-mellanox.bin target/sonic-$(GROUP_NAME)-rpc.bin
+              mv target/sonic-$(GROUP_NAME).bin target/sonic-$(GROUP_NAME)-rpc.bin
+            fi
+            if [ $(session_monitor) == yes ]; then
+              make $BUILD_OPTIONS ENABLE_SESSION_MONITOR=y target/sonic-$(GROUP_NAME).bin
+              mv target/sonic-$(GROUP_NAME).bin target/sonic-$(GROUP_NAME)-session-monitor.bin
             fi
             if [ $(GROUP_NAME) == nvidia-bluefield ]; then
               make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).bfb

.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/docker-sonic-mgmt.yml

@@ -57,9 +57,7 @@ stages:
 
         make NOBUSTER=1 NOBULLSEYE=1 SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic DOCKER_BUILDKIT=0
         make -f Makefile.work BLDENV=bookworm SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y target/docker-sonic-mgmt.gz
-        cp target -r $(Build.ArtifactStagingDirectory)/target
-        docker load -i target/docker-sonic-mgmt.gz
-        docker tag docker-sonic-mgmt $REGISTRY_SERVER/docker-sonic-mgmt:latest
+        cp -r target $(Build.ArtifactStagingDirectory)/target
       env:
         REGISTRY_SERVER: ${{ parameters.registry_url }}
       displayName: Build docker-sonic-mgmt.gz
@@ -68,45 +66,62 @@ stages:
       artifact: 'docker-sonic-mgmt'
       displayName: "Archive docker image sonic-mgmt"
 
-  - job: validate_docker_image_and_upload
+    - bash: |
+        set -ex
+        docker load -i $(Build.ArtifactStagingDirectory)/target/docker-sonic-mgmt.gz
+        docker tag docker-sonic-mgmt:latest $REGISTRY_SERVER/docker-sonic-mgmt:lastbuild
+        docker images
+      env:
+        REGISTRY_SERVER: ${{ parameters.registry_url }}
+      displayName: 'Load and tag docker-sonic-mgmt as lastbuild'
+
+    - task: Docker@2
+      displayName: 'Push docker-sonic-mgmt:lastbuild to registry'
+      condition: succeeded()
+      inputs:
+        containerRegistry: ${{ parameters.registry_conn }}
+        repository: docker-sonic-mgmt
+        command: push
+        tags: lastbuild
+
+- stage: Test
+  dependsOn: Build
+  condition: and(succeeded(), in(dependencies.Build.result, 'Succeeded'))
+  variables:
+  - group: SONiC-Elastictest
+  - name: BUILD_BRANCH
+    value: $(Build.SourceBranchName)
+  jobs:
+    - template: .azure-pipelines/pr_test_template.yml@sonic-mgmt
+      parameters:
+        CHECKOUT_SONIC_MGMT: true
+        OVERRIDE_PARAMS:
+          REPO_NAME: "sonic-mgmt"
+          SETUP_CONTAINER_PARAMS: "-i ${{ parameters.registry_url }}/docker-sonic-mgmt:lastbuild"
+
+- stage: Publish
+  dependsOn: Test
+  condition: and(succeeded(), in(dependencies.Test.result, 'Succeeded'))
+  jobs:
+  - job: PublishAsLatest
     pool: sonicso1ES-amd64
-    timeoutInMinutes: 360
-    dependsOn: Build
+    timeoutInMinutes: 60
     steps:
-    - checkout: sonic-mgmt
-      clean: true
-      fetchDepth: 0
-      displayName: 'Checkout sonic-mgmt'
-
     - download: current
       artifact: 'docker-sonic-mgmt'
-      displayName: "Download docker image sonic-mgmt"
-
-    - script: |
-        set -ex
-
-        docker load -i $(Pipeline.Workspace)/docker-sonic-mgmt/target/docker-sonic-mgmt.gz
-
-        cd ansible
-        sudo ./setup-management-network.sh -d
-        cd ../
-        docker rm -f sonic-mgmt
-
-        ./setup-container.sh -n sonic-mgmt -d /data -i docker-sonic-mgmt -v
-
-        docker exec sonic-mgmt bash -c "echo 'Container is running' && ps aux"
-      displayName: 'Setup sonic-mgmt docker container and verify'
+      displayName: "Download docker-sonic-mgmt image"
 
     - bash: |
         set -ex
-
+        docker load -i $(Pipeline.Workspace)/docker-sonic-mgmt/target/docker-sonic-mgmt.gz
         docker tag docker-sonic-mgmt:latest $REGISTRY_SERVER/docker-sonic-mgmt:latest
+        docker images
       env:
         REGISTRY_SERVER: ${{ parameters.registry_url }}
-      displayName: 'Tag docker-sonic-mgmt'
+      displayName: 'Load and tag docker-sonic-mgmt as latest'
 
     - task: Docker@2
-      displayName: Upload image
+      displayName: 'Push docker-sonic-mgmt:latest to registry'
       condition: succeeded()
       inputs:
         containerRegistry: ${{ parameters.registry_conn }}

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

@@ -53,13 +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)
-      if echo ${{ parameters.pool }} | grep ${{ parameters.arch }};then
-        image_latest=$(echo ${image_latest} | sed 's/:/-${{ parameters.arch }}:/')
-      fi
-      image_branch=$(echo $(echo $image_latest | awk -F: '{print$1}'):$(Build.SourceBranchName))
+      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
@@ -72,11 +73,17 @@ jobs:
 
       docker tag ${image_tag} ${REGISTRY_SERVER}/${image_tag}
       docker push ${REGISTRY_SERVER}/${image_tag}
-      docker tag ${image_tag} ${REGISTRY_SERVER}/${image_branch}
-      docker push ${REGISTRY_SERVER}/${image_branch}
-      if [[ "$(Build.SourceBranchName)" == "master" ]];then
-        docker tag ${image_tag} ${REGISTRY_SERVER}/${image_latest}
-        docker push ${REGISTRY_SERVER}/${image_latest}
+      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
+        docker tag ${image_tag} ${REGISTRY_SERVER}/${image_branch}
+        docker push ${REGISTRY_SERVER}/${image_branch}
+        if [[ "$(Build.SourceBranchName)" == "master" ]];then
+          docker tag ${image_tag} ${REGISTRY_SERVER}/${image_latest}
+          docker push ${REGISTRY_SERVER}/${image_latest}
+        fi
       fi
     env:
       REGISTRY_SERVER: ${{ parameters.registry_url }}

.azure-pipelines/template-variables.yml

@@ -1,6 +1,6 @@
 variables:
   DEFAULT_CONTAINER_REGISTRY: 'publicmirror.azurecr.io'
-  COMMON_LIB_BUILD_ENVS: 'bookworm'
+  COMMON_LIB_BUILD_ENVS: 'bookworm trixie'
   SONIC_SLAVE_DOCKER_DRIVER: 'overlay2'
   SONIC_BUILD_RETRY_COUNT: 3
   SONIC_BUILD_RETRY_INTERVAL: 600

.github/CODEOWNERS

@@ -86,7 +86,7 @@
 /src/snmpd/                             @sonic-net/sonic-management
 
 # dhcp relay
-/src/dhcp6relay/                        @sonic-net/sonic-fundamentals
+/src/dhcprelay/                         @sonic-net/sonic-fundamentals
 /src/dhcpmon/                           @sonic-net/sonic-fundamentals
 /src/isc-dhcp/                          @sonic-net/sonic-fundamentals
 

.gitmodules

@@ -39,7 +39,7 @@
 	url = https://github.com/nvidia-sonic/sonic-platform-common
 [submodule "src/sonic-platform-daemons"]
 	path = src/sonic-platform-daemons
-	url = https://github.com/sonic-net/sonic-platform-daemons
+	url = https://github.com/nvidia-sonic/sonic-platform-daemons
 [submodule "src/sonic-platform-pde"]
 	path = src/sonic-platform-pde
 	url = https://github.com/sonic-net/sonic-platform-pdk-pde
@@ -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/

Makefile

@@ -5,7 +5,7 @@ NOSTRETCH ?= 1
 NOBUSTER ?= 1
 NOBULLSEYE ?= 1
 NOBOOKWORM ?= 0
-NOTRIXIE ?= 1
+NOTRIXIE ?= 0
 
 override Q := @
 ifeq ($(QUIET),n)
@@ -60,10 +60,10 @@ ifeq ($(NOBULLSEYE), 0)
 	$(MAKE_WITH_RETRY) EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=bullseye -f Makefile.work bullseye
 endif
 ifeq ($(NOBOOKWORM), 0)
-	$(MAKE_WITH_RETRY) BLDENV=bookworm -f Makefile.work $@
+	$(MAKE_WITH_RETRY) EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=bookworm -f Makefile.work bookworm
 endif
 ifeq ($(NOTRIXIE), 0)
-	$(MAKE_WITH_RETRY) BLDENV=trixie -f Makefile.work trixie
+	$(MAKE_WITH_RETRY) BLDENV=trixie -f Makefile.work $@
 endif
 
 	BLDENV=bookworm $(MAKE) -f Makefile.work docker-cleanup

Makefile.cache

@@ -67,6 +67,7 @@
 # Common files and FLAGS
 # Run the 'touch cache.skip.common' command in the base directory to exclude the common files from caching
 SONIC_COMMON_FILES_LIST :=  $(if $(wildcard cache.skip.common),, .platform slave.mk rules/functions Makefile.cache)
+SONIC_DEVICE_FILES_LIST := $(shell git ls-files -s device | grep -v ^120000 | grep -Eo device.*)
 SONIC_COMMON_FLAGS_LIST :=  $(CONFIGURED_PLATFORM) \
                             $(CONFIGURED_ARCH) \
                             $(BLDENV) \

Makefile.work

@@ -73,9 +73,9 @@ USER := $(shell id -un)
 PWD := $(shell realpath $(shell pwd))
 USER_LC := $(shell echo $(USER) | tr A-Z a-z)
 ifneq ($(DEFAULT_CONTAINER_REGISTRY),)
-DOCKER_MACHINE := $(shell docker run --rm $(DEFAULT_CONTAINER_REGISTRY)/debian:buster uname -m)
+DOCKER_MACHINE := $(shell docker run --rm $(DEFAULT_CONTAINER_REGISTRY)/debian:trixie uname -m)
 else
-DOCKER_MACHINE := $(shell docker run --rm debian:buster uname -m)
+DOCKER_MACHINE := $(shell docker run --rm debian:trixie uname -m)
 endif
 HOST_DOCKERD_GID := $(shell getent group docker | cut -d : -f3)
 
@@ -218,6 +218,7 @@ $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) \
 	DOCKER_EXTRA_OPTS=$(DOCKER_EXTRA_OPTS) \
 	DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \
 	FIPS_VERSION=$(FIPS_VERSION) \
+	FIPS_GOLANG_MAIN_VERSION=$(FIPS_GOLANG_MAIN_VERSION) \
 	FIPS_GOLANG_VERSION=$(FIPS_GOLANG_VERSION) \
 	j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)
 
@@ -261,7 +262,7 @@ SLAVE_TAG = $(shell \
 		 $(SLAVE_DIR)/Dockerfile \
 		 $(SLAVE_DIR)/sources.list.* \
 		 $(SLAVE_DIR)/buildinfo/versions/versions-* \
-	&& echo $(USER)/$(PWD)/$(CONFIGURED_PLATFORM)) \
+	&& echo $(USER)/$(PWD)/$(CONFIGURED_ARCH)) \
 	| sha1sum \
 	| awk '{print substr($$1,0,11);}')
 
@@ -343,6 +344,11 @@ ifneq ($(SECURE_UPGRADE_PROD_SIGNING_TOOL),)
 	DOCKER_RUN += -v $(SECURE_UPGRADE_PROD_SIGNING_TOOL):/sonic/scripts/$(shell basename -- $(SECURE_UPGRADE_PROD_SIGNING_TOOL)):ro
 endif
 
+# Pass the Signing prod tool arguments as environment variable to avoid make command-line parsing issues
+ifneq ($(SECURE_UPGRADE_PROD_TOOL_ARGS),)
+	DOCKER_RUN += -e "SECURE_UPGRADE_PROD_TOOL_ARGS=$(SECURE_UPGRADE_PROD_TOOL_ARGS)"
+endif
+
 ifneq ($(SONIC_DPKG_CACHE_SOURCE),)
 	DOCKER_RUN += -v "$(SONIC_DPKG_CACHE_SOURCE):/dpkg_cache:rw"
 endif
@@ -451,6 +457,8 @@ DOCKER_USER_BUILD = docker build --no-cache \
 	       -f $(SLAVE_DIR)/Dockerfile.user \
 	       $(SLAVE_DIR) $(SPLIT_LOG) $(DOCKER_LOG)
 
+DOCKER_USER_PULL = docker pull \
+			$(REGISTRY_SERVER):$(REGISTRY_PORT)$(REGISTRY_SERVER_PATH)/$(SLAVE_IMAGE):$(SLAVE_TAG)
 
 DOCKER_SLAVE_BASE_INSPECT = \
 	{ \
@@ -490,8 +498,24 @@ DOCKER_SLAVE_USER_INSPECT = \
 		docker inspect --type image $(SLAVE_IMAGE):$(SLAVE_TAG) &> /dev/null; \
 	}
 
+DOCKER_SLAVE_USER_PULL_REGISTRY = \
+	[ $(ENABLE_DOCKER_BASE_PULL) == y ] && \
+	{ \
+		echo Image $(SLAVE_IMAGE):$(SLAVE_TAG) not found. Pulling...; \
+		$(DOCKER_USER_PULL); \
+	} && \
+	{ \
+		docker tag $(REGISTRY_SERVER):$(REGISTRY_PORT)$(REGISTRY_SERVER_PATH)/$(SLAVE_IMAGE):$(SLAVE_TAG) $(SLAVE_IMAGE):$(SLAVE_TAG) && \
+		$(COLLECT_DOCKER); \
+	}\
+
 SONIC_SLAVE_USER_BUILD = \
-	{ $(DOCKER_SLAVE_USER_INSPECT) } || \
+	{ \
+		$(DOCKER_SLAVE_USER_INSPECT); \
+	} || \
+	{ \
+		$(DOCKER_SLAVE_USER_PULL_REGISTRY); \
+	} || \
 	{ \
 		set -o pipefail ; \
 		echo Image $(SLAVE_IMAGE):$(SLAVE_TAG) not found. Building... ; \
@@ -545,6 +569,7 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                            SONIC_INCLUDE_SYSTEM_GNMI=$(INCLUDE_SYSTEM_GNMI) \
                            SONIC_INCLUDE_SYSTEM_BMP=$(INCLUDE_SYSTEM_BMP) \
                            SONIC_INCLUDE_SYSTEM_EVENTD=$(INCLUDE_SYSTEM_EVENTD) \
+                           SONIC_INCLUDE_SYSTEM_OTEL=$(INCLUDE_SYSTEM_OTEL) \
                            INCLUDE_DHCP_RELAY=$(INCLUDE_DHCP_RELAY) \
                            INCLUDE_DHCP_SERVER=$(INCLUDE_DHCP_SERVER) \
                            INCLUDE_MACSEC=$(INCLUDE_MACSEC) \
@@ -562,7 +587,6 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                            SECURE_UPGRADE_SIGNING_CERT=$(SECURE_UPGRADE_SIGNING_CERT) \
                            SECURE_UPGRADE_KERNEL_CAFILE=$(SECURE_UPGRADE_KERNEL_CAFILE) \
                            SECURE_UPGRADE_PROD_SIGNING_TOOL=$(SECURE_UPGRADE_PROD_SIGNING_TOOL) \
-                           SECURE_UPGRADE_PROD_TOOL_ARGS="\"'$(SECURE_UPGRADE_PROD_TOOL_ARGS)'\"" \
                            SONIC_DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \
                            ENABLE_HOST_SERVICE_ON_START=$(ENABLE_HOST_SERVICE_ON_START) \
                            SLAVE_DIR=$(SLAVE_DIR) \
@@ -608,6 +632,7 @@ export MIRROR_SECURITY_URLS
 export MIRROR_SNAPSHOT
 export SONIC_VERSION_CONTROL_COMPONENTS
 export PIP_HTTP_TIMEOUT
+export SECURE_UPGRADE_PROD_TOOL_ARGS
 
 %:: | sonic-build-hooks
 ifneq ($(filter y, $(MULTIARCH_QEMU_ENVIRON) $(CROSS_BUILD_ENVIRON)),)