From 48b09e3130504411a2ef5efe075e8bb84cee10ea Mon Sep 17 00:00:00 2001
From: kangping <wgtdkp@google.com>
Date: Fri, 12 Mar 2021 23:25:20 +0800
Subject: [PATCH] [tests] update OTBR CI test script (#6215)

To support new OTBR border routing feature.
---
 .github/workflows/simulation-1.2.yml |  1 +
 script/test                          | 12 +++---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/simulation-1.2.yml b/.github/workflows/simulation-1.2.yml
index 67af137f1..ca381a996 100644
--- a/.github/workflows/simulation-1.2.yml
+++ b/.github/workflows/simulation-1.2.yml
@@ -315,6 +315,7 @@ jobs:
       MULTIPLY: 1
       PYTHONUNBUFFERED: 1
       VERBOSE: 1
+      BORDER_ROUTING: 1
     steps:
     - uses: actions/checkout@v2
     - name: Build OTBR Docker
diff --git a/script/test b/script/test
index 2362bda37..9bde5bca9 100755
--- a/script/test
+++ b/script/test
@@ -262,17 +262,9 @@ do_build_otbr_docker()
     echo "Building OTBR Docker ..."
     local otdir
     local otbrdir
-    local otbr_options="-DOT_DNSSD_SERVER=ON -DOT_DNS_CLIENT=ON -DOT_SRP_CLIENT=ON -DOT_SLAAC=ON -DOT_DUA=ON -DOT_MLR=ON -DOT_COVERAGE=ON -DOTBR_REST=OFF -DOTBR_WEB=OFF -DOTBR_MDNS=mDNSResponder -DOTBR_SRP_ADVERTISING_PROXY=ON -DOTBR_DUA_ROUTING=ON"
+    local otbr_options="-DOT_DNSSD_SERVER=ON -DOT_DNS_CLIENT=ON -DOT_SRP_CLIENT=ON -DOT_SLAAC=ON -DOT_DUA=ON -DOT_MLR=ON -DOT_COVERAGE=ON -DOTBR_REST=OFF -DOTBR_WEB=OFF -DOTBR_DUA_ROUTING=ON"
     local otbr_docker_image=${OTBR_DOCKER_IMAGE:-otbr-ot12-backbone-ci}
 
-    # Always enable SRP server for OTBR.
-    # TODO: enable SRP server inside OTBR after this PR merged.
-    otbr_options="${otbr_options} -DOT_SRP_SERVER=ON -DOT_SERVICE=ON -DOT_ECDSA=ON"
-
-    if [[ ${BORDER_ROUTING} == "1" ]]; then
-        otbr_options="${otbr_options} -DOT_BORDER_ROUTING=ON"
-    fi
-
     otbrdir=$(mktemp -d -t otbr_XXXXXX)
     otdir=$(pwd)
 
@@ -283,6 +275,8 @@ do_build_otbr_docker()
         cp -r "${otdir}" third_party/openthread/repo
         rm -rf .git
         docker build -t "${otbr_docker_image}" -f etc/docker/Dockerfile . \
+            --build-arg BORDER_ROUTING="${BORDER_ROUTING}" \
+            --build-arg INFRA_IF_NAME=eth0 \
             --build-arg BACKBONE_ROUTER=1 \
             --build-arg REFERENCE_DEVICE=1 \
             --build-arg OT_BACKBONE_CI=1 \