From 22b18e562f5e2e69787363c66d85b9a4d66e9352 Mon Sep 17 00:00:00 2001 From: Yaqiang Zhu Date: Thu, 30 Nov 2023 16:52:54 -0500 Subject: [PATCH] [dhcp_server] Set to build dhcp_server image in vs image (#17340) Currently in this repo would not build dhcp_server container image by default, which would cause that building issue for dhcp_server introduced by other modules cannot be noticed in time. This PR is to set build dhcp_server container in vs image. --- azure-pipelines.yml | 2 +- rules/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 223e49be4..43ac0cb02 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -50,7 +50,7 @@ stages: jobs: - template: .azure-pipelines/azure-pipelines-build.yml parameters: - buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) BUILD_MULTIASIC_KVM=y ${{ variables.VERSION_CONTROL_OPTIONS }}' + buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) BUILD_MULTIASIC_KVM=y INCLUDE_DHCP_SERVER=y ${{ variables.VERSION_CONTROL_OPTIONS }}' jobGroups: - name: vs diff --git a/rules/config b/rules/config index a9969ccbd..209129d03 100644 --- a/rules/config +++ b/rules/config @@ -153,7 +153,7 @@ INCLUDE_NAT = y INCLUDE_DHCP_RELAY = y # INCLUDE_DHCP_SERVER - build and install dhcp-server package -INCLUDE_DHCP_SERVER = n +INCLUDE_DHCP_SERVER ?= n # INCLUDE_P4RT - build docker-p4rt for P4RT support INCLUDE_P4RT = n