diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-18 15:43:07 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-18 15:43:07 +0000 |
commit | e05d61903d3daaf7caa7ce1b1f225e64976075ab (patch) | |
tree | e698d06f66f9b4e05ecc93aa7d4a8b2dbba42b91 /ci/onos/01-deploybundle.sh | |
parent | a14701ad782b38314165f6e2d9854d76aa97b95f (diff) | |
parent | 4997494d40390cb130868163c994fac9d8967f1c (diff) |
Merge "JOID-46 Add script to create the external network and update the gw_mac for the L3."
Diffstat (limited to 'ci/onos/01-deploybundle.sh')
-rw-r--r-- | ci/onos/01-deploybundle.sh | 11 |
1 files changed, 7 insertions, 4 deletions
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 |