Remove ENABLE_DHCP_GRAPH_SERVICE option from make command line (sonic-net#58)

qiluo-msft · web-flow · commit 05150a69be7c · 2019-12-04T11:00:23.000-08:00
diff --git a/jenkins/mellanox/buildimage-mlnx-201811-rpc/Jenkinsfile b/jenkins/mellanox/buildimage-mlnx-201811-rpc/Jenkinsfile
@@ -34,8 +34,8 @@ pipeline {
 git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'
 
 make configure PLATFORM=mellanox
-make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y ENABLE_SYNCD_RPC=y all
-make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y target/sonic-mellanox.bin
+make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_SYNCD_RPC=y all
+make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-mellanox.bin
 '''
             }
         }
diff --git a/jenkins/mellanox/buildimage-mlnx-201904/Jenkinsfile b/jenkins/mellanox/buildimage-mlnx-201904/Jenkinsfile
@@ -34,7 +34,7 @@ pipeline {
 git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'
 
 make configure PLATFORM=mellanox
-make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y target/sonic-mellanox.bin
+make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-mellanox.bin
 '''
             }
         }
diff --git a/jenkins/mellanox/buildimage-mlnx-all-rpc/Jenkinsfile b/jenkins/mellanox/buildimage-mlnx-all-rpc/Jenkinsfile
@@ -25,8 +25,8 @@ pipeline {
 git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'
 
 make configure PLATFORM=mellanox
-make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y ENABLE_SYNCD_RPC=y all
-make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y target/sonic-mellanox.bin
+make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_SYNCD_RPC=y all
+make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-mellanox.bin
 '''
             }
         }
diff --git a/jenkins/mellanox/buildimage-mlnx-all/Jenkinsfile b/jenkins/mellanox/buildimage-mlnx-all/Jenkinsfile
@@ -35,9 +35,9 @@ pipeline {
 git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'
 
 make configure PLATFORM=mellanox
-make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y INSTALL_DEBUG_TOOLS=y target/sonic-mellanox.bin
+make SONIC_CONFIG_BUILD_JOBS=1 INSTALL_DEBUG_TOOLS=y target/sonic-mellanox.bin
 mv target/sonic-mellanox.bin target/sonic-mellanox-dbg.bin
-make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y target/sonic-mellanox.bin
+make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-mellanox.bin
 ENABLE_SYNCD_RPC=y make SONIC_CONFIG_BUILD_JOBS=1 target/docker-syncd-mlnx-rpc.gz target/docker-ptf-mlnx.gz
 '''
             }
diff --git a/jenkins/mellanox/buildimage-mlnx-bmtor-rpc/Jenkinsfile b/jenkins/mellanox/buildimage-mlnx-bmtor-rpc/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
 git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'
 
 make configure PLATFORM=mellanox
-make ENABLE_DHCP_GRAPH_SERVICE=y ENABLE_SYNCD_RPC=y target/sonic-mellanox.bin
+make ENABLE_SYNCD_RPC=y target/sonic-mellanox.bin
 '''
             }
         }
diff --git a/jenkins/mellanox/buildimage-mlnx-bmtor/Jenkinsfile b/jenkins/mellanox/buildimage-mlnx-bmtor/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
 git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'
 
 make configure PLATFORM=mellanox
-make ENABLE_DHCP_GRAPH_SERVICE=y target/sonic-mellanox.bin
+make target/sonic-mellanox.bin
 '''
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ pipeline {`
`34`	`34`	`git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'`
`35`	`35`
`36`	`36`	`make configure PLATFORM=mellanox`
`37`		`-make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y ENABLE_SYNCD_RPC=y all`
`38`		`-make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y target/sonic-mellanox.bin`
	`37`	`+make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_SYNCD_RPC=y all`
	`38`	`+make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-mellanox.bin`
`39`	`39`	`'''`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ pipeline {`
`34`	`34`	`git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'`
`35`	`35`
`36`	`36`	`make configure PLATFORM=mellanox`
`37`		`-make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y target/sonic-mellanox.bin`
	`37`	`+make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-mellanox.bin`
`38`	`38`	`'''`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ pipeline {`
`25`	`25`	`git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'`
`26`	`26`
`27`	`27`	`make configure PLATFORM=mellanox`
`28`		`-make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y ENABLE_SYNCD_RPC=y all`
`29`		`-make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y target/sonic-mellanox.bin`
	`28`	`+make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_SYNCD_RPC=y all`
	`29`	`+make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-mellanox.bin`
`30`	`30`	`'''`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ pipeline {`
`33`	`33`	`git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'`
`34`	`34`
`35`	`35`	`make configure PLATFORM=mellanox`
`36`		`-make ENABLE_DHCP_GRAPH_SERVICE=y ENABLE_SYNCD_RPC=y target/sonic-mellanox.bin`
	`36`	`+make ENABLE_SYNCD_RPC=y target/sonic-mellanox.bin`
`37`	`37`	`'''`
`38`	`38`	`}`
`39`	`39`	`}`