At the moment, setting up a network bridge is unconditionally placed in the dom0 xen.start script. Since we might want to use the network interface (there is only one working GEM on the board) for other tests (e.g. passthrough), move the bridge setup to a dom0_check variable being part of a default ping test (i.e. if no test variant specified).
Signed-off-by: Michal Orzel <[email protected]> --- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index 82158ab7ea1b..73ba251f4cc1 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -6,6 +6,14 @@ test_variant=$1 if [ -z "${test_variant}" ]; then passed="ping test passed" + dom0_check=" +brctl addbr xenbr0 +brctl addif xenbr0 eth0 +ifconfig eth0 up +ifconfig xenbr0 up +ifconfig xenbr0 192.168.0.1 +xl network-attach 1 type=vif +" domU_check=" until ifconfig eth0 192.168.0.2 &> /dev/null && ping -c 10 192.168.0.1; do sleep 30 @@ -51,13 +59,6 @@ bash /etc/init.d/xencommons start /usr/local/lib/xen/bin/init-dom0less -brctl addbr xenbr0 -brctl addif xenbr0 eth0 -ifconfig eth0 up -ifconfig xenbr0 up -ifconfig xenbr0 192.168.0.1 - -xl network-attach 1 type=vif ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -- 2.25.1
