From 4bd7e99232176621be927dd484bf0a27a5456e57 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 30 Apr 2021 05:14:24 +0900 Subject: [PATCH] test-network: set DNS= and NTP= for DHCP server Now, RoutesToDNS= and RoutesToNTP= are enabled by default on DHCPv4 client. So, if DHCP server picks up DNS or NTP servers from uplink, then the routes may break CI environment. Hopefully fixes #19463. --- test/test-network/conf/agent-server.network | 3 +++ test/test-network/conf/dhcp-server-timezone-router.network | 2 ++ test/test-network/conf/dhcp-server-with-ipv6-prefix.network | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/test/test-network/conf/agent-server.network b/test/test-network/conf/agent-server.network index d58abdf271..65bcc54dc1 100644 --- a/test/test-network/conf/agent-server.network +++ b/test/test-network/conf/agent-server.network @@ -4,7 +4,10 @@ Name=server Address=192.168.5.1/24 IPForward=ipv4 DHCPServer=yes + [DHCPServer] BindToInterface=no PoolOffset=150 PoolSize=1 +DNS=192.168.5.1 +NTP=192.168.5.1 diff --git a/test/test-network/conf/dhcp-server-timezone-router.network b/test/test-network/conf/dhcp-server-timezone-router.network index 3ebbf05d3e..34e2d737ce 100644 --- a/test/test-network/conf/dhcp-server-timezone-router.network +++ b/test/test-network/conf/dhcp-server-timezone-router.network @@ -11,3 +11,5 @@ PoolOffset=10 PoolSize=50 EmitRouter=yes Timezone=Europe/Berlin +DNS=192.168.5.1 +NTP=192.168.5.1 diff --git a/test/test-network/conf/dhcp-server-with-ipv6-prefix.network b/test/test-network/conf/dhcp-server-with-ipv6-prefix.network index 05ebe3e7e2..7a1cfc65e1 100644 --- a/test/test-network/conf/dhcp-server-with-ipv6-prefix.network +++ b/test/test-network/conf/dhcp-server-with-ipv6-prefix.network @@ -9,3 +9,7 @@ IPv6SendRA=yes [IPv6Prefix] Prefix=2002:da8:1:0::/64 + +[DHCPServer] +DNS=192.168.5.1 +NTP=192.168.5.1 -- 2.25.1