From 4997494d40390cb130868163c994fac9d8967f1c Mon Sep 17 00:00:00 2001 From: zhangyuanyou Date: Sat, 16 Jan 2016 15:42:35 +0800 Subject: JOID-46 Add script to create the external network and update the gw_mac for the L3. Change-Id: Ied508858ebeae1f76b585c07ed5d175cbcb5eead --- ci/onos/01-deploybundle.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'ci/onos/01-deploybundle.sh') diff --git a/ci/onos/01-deploybundle.sh b/ci/onos/01-deploybundle.sh index 85a5ff98..60935ad4 100644 --- a/ci/onos/01-deploybundle.sh +++ b/ci/onos/01-deploybundle.sh @@ -4,18 +4,18 @@ set -ex case "$1" in 'nonha' ) - cp onos/juju-deployer/onos.yaml ./bundles.yaml + cp onos/juju-deployer/ovs-onos-nonha.yaml ./bundles.yaml ;; 'ha' ) - cp onos/juju-deployer/onos-ha.yaml ./bundles.yaml + cp onos/juju-deployer/ovs-onos-ha.yaml ./bundles.yaml ;; 'tip' ) - cp onos/juju-deployer/onos-tip.yaml ./bundles.yaml + cp onos/juju-deployer/ovs-onos-tip.yaml ./bundles.yaml cp common/source/* ./ sed -i -- "s|branch: master|branch: stable/$2|g" ./*.yaml ;; * ) - cp onos/juju-deployer/onos.yaml ./bundles.yaml + cp onos/juju-deployer/ovs-onos-nonha.yaml ./bundles.yaml ;; esac @@ -76,3 +76,6 @@ case "$1" in ;; esac +echo "... onos prepare test ..." + sleep 180s + sh onos/juju_test_prepare.sh "$3" \ No newline at end of file -- cgit 1.2.3-korg