diff options
| -rwxr-xr-x | ci/01-deploybundle.sh | 14 | ||||
| -rwxr-xr-x | ci/deploy.sh | 5 |
2 files changed, 12 insertions, 7 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index 71f2362a..96be450e 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -107,10 +107,10 @@ case "$1" in ;; esac -case "$4" in - 'onos' ) - echo "... onos prepare test ..." - sleep 180s - sh onos/juju_test_prepare.sh "$3" - ;; -esac +#case "$4" in +# 'onos' ) +# echo "... onos prepare test ..." +# sleep 180s +# sh onos/juju_test_prepare.sh "$3" +# ;; +#esac diff --git a/ci/deploy.sh b/ci/deploy.sh index 6005eb1d..bd9e0ce3 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -163,6 +163,11 @@ unitAddress() createopenrc() { + if [ "$opnfvsdn" -eq "onos" ] + ./onos/juju_test_prepare.sh "$opnfvlab" + check_status + fi + mkdir -m 0700 -p cloud controller_address=$(unitAddress keystone 0) |