diff options
| author |   meimei <meimei@huawei.com> | 2016-12-07 14:40:15 +0800 |
|---|---|---|
| committer | meimei <meimei@huawei.com> | 2016-12-07 14:40:15 +0800 |
| commit | decf2c1897f1d2184e1589a2346601b0ac8a977d (patch) | |
| tree | 2ec27bed56b559d76cac6d9fef7f6bc4b3f2a25f /jjb/compass4nfv/compass-deploy.sh | |
| parent | 12feb50ad649b223ed4dad4874f453362bdb2cbe (diff) | |
move option into deploy_ci.sh
Change-Id: I106e16c2ccae08eae42a16048b81bf02cc55bf87
Signed-off-by: meimei <meimei@huawei.com>
Diffstat (limited to 'jjb/compass4nfv/compass-deploy.sh')
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 256717953..017741ae6 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -29,19 +29,9 @@ cd $WORKSPACE export OS_VERSION=${COMPASS_OS_VERSION} export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION} -if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" = "mitaka" ]]; then - export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${COMPASS_OS_VERSION_OPTION} - export OS_VERSION=${COMPASS_OS_VERSION_OPTION} -fi -if [[ "${OPENSTACK_VERSION}" = "newton" ]]; then - export OS_VERSION="xenial" - export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${OS_VERSION} -fi - if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then export NETWORK_CONF_FILE=network_ocl.yml - export OPENSTACK_VERSION=liberty elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then export NETWORK_CONF_FILE=network_onos.yml else @@ -57,7 +47,11 @@ else export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${DEPLOY_SCENARIO}.yml fi -./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF} +export DHA=${DHA_CONF} +export NETWORK=${NETWORK_CONF} + +./ci/deploy_ci.sh + if [ $? -ne 0 ]; then echo "depolyment failed!" deploy_ret=1 |