Unify smartswitch and non-smartswitch images for Mellanox and Cisco (#23995)

Cherry-pick changes in PR Remove SMARTSWITCH build flag across platforms #23974 and PR [build] Set INCLUDE_DHCP_SERVER default value to n. #23986 to 202505 branch
Why I did it
The reason for this change is to avoid separate qualification for smartswitch images and non-smartswitch images. The only difference between the two previously was the presence of dhcp_server container as part of the image. Since dhcp_server doesn't take up much space (in the image) or memory (when running), the idea is to enabled dhcp_server for all Mellanox and Cisco devices so both smartswitch and non-smartswitch can use the same image binary. Normal non-smartswitch devices can still function as usual by having dhcp_server disabled in config_db.json.

* Cherry-pick changes in PR #23974 and PR #23986 to 202505 branch

Signed-off-by: Prabhat Aravind <[email protected]>

Author: prabhataravind

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

@@ -46,7 +46,6 @@ jobs:
       docker_syncd_rpc_image: no
       syncd_rpc_image: no
       platform_rpc: no
-      ss_image: no
       ${{ if parameters.qemuOrCrossBuild }}:
         SONIC_SLAVE_DOCKER_DRIVER: 'vfs'
         CACHE_MODE: 'none'
@@ -115,7 +114,6 @@ jobs:
         - name: mellanox
           variables:
             dbg_image: yes
-            ss_image: yes
             docker_syncd_rpc_image: yes
             syncd_rpc_image: yes
             platform_rpc: mlnx
@@ -145,6 +143,9 @@ jobs:
       - template: .azure-pipelines/template-daemon.yml@buildimage
       - bash: |
           set -ex
+          if echo $(GROUP_NAME) | grep mellanox; then
+            BUILD_OPTIONS="$BUILD_OPTIONS INCLUDE_DHCP_SERVER=y"
+          fi
           if [ $(GROUP_NAME) == pensando ]; then
             make $BUILD_OPTIONS target/sonic-pensando.tar
           elif [ $(GROUP_NAME) == vs ]; then
@@ -182,10 +183,6 @@ jobs:
               make  $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-$(GROUP_NAME).bin
               mv target/sonic-$(GROUP_NAME).bin target/sonic-$(GROUP_NAME)-dbg.bin
             fi
-            if [ $(ss_image) == yes ]; then
-              make $BUILD_OPTIONS SMARTSWITCH=1 INCLUDE_DHCP_SERVER=y target/sonic-$(GROUP_NAME).bin
-              mv target/sonic-$(GROUP_NAME).bin target/sonic-$(GROUP_NAME)-smartswitch.bin
-            fi
             if [ $(swi_image) == yes ]; then
               make $BUILD_OPTIONS ENABLE_IMAGE_SIGNATURE=y target/sonic-aboot-$(GROUP_NAME).swi
             fi

Makefile

@@ -37,9 +37,6 @@ endif
 PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
 PLATFORM_CHECKOUT := platform/checkout
 PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini
-ifeq ($(SMARTSWITCH),1)
-PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM)-smartswitch.ini
-endif
 PLATFORM_CHECKOUT_CMD := $(shell if [ -f $(PLATFORM_CHECKOUT_FILE) ]; then PLATFORM_PATH=$(PLATFORM_PATH) j2 $(PLATFORM_CHECKOUT)/template.j2 $(PLATFORM_CHECKOUT_FILE); fi)
 MAKE_WITH_RETRY := ./scripts/run_with_retry $(MAKE)
 

platform/checkout/cisco-8000-smartswitch.ini

@@ -42,9 +42,6 @@ DEFAULT_BUILD_LOG_TIMESTAMP = none
 # CHANGE_DEFAULT_PASSWORD - enforce default user/users to change password on 1st login
 CHANGE_DEFAULT_PASSWORD ?= n
 
-# Default value for SMARTSWITCH
-SMARTSWITCH ?= 0
-
 # DEFAULT_USERNAME - default username for installer build
 DEFAULT_USERNAME = admin
 
@@ -155,14 +152,9 @@ INCLUDE_NAT = y
 # INCLUDE_DHCP_RELAY - build and install dhcp-relay package
 INCLUDE_DHCP_RELAY = y
 
-# INCLUDE_DHCP_SERVER - build and install dhcp-server package
+# INCLUDE_DHCP_SERVER - build dhcp-server package and enable based on config_db.json
 INCLUDE_DHCP_SERVER ?= n
 
-# Conditionally enable DHCP_SERVER when SMARTSWITCH is set to 1
-ifeq ($(SMARTSWITCH), 1)
-    INCLUDE_DHCP_SERVER = y
-endif
-
 # INCLUDE_P4RT - build docker-p4rt for P4RT support
 INCLUDE_P4RT = n