diff options
| author |   meimei <meimei@huawei.com> | 2016-05-23 15:43:12 +0800 |
|---|---|---|
| committer | meimei <meimei@huawei.com> | 2016-05-24 10:40:31 +0800 |
| commit | 2001de436ca7411591325a27cb2b6e3745b2039b (patch) | |
| tree | 2a574c220f1befad0a41b2b19ae40ab726e101c4 /jjb/compass4nfv/compass-deploy.sh | |
| parent | 8f4fcc64ad23b6023a4bdc5c95aea62dcead983f (diff) | |
[compass4nfv] enable opencontrail ci jobs in compass
- enable ocl scenario only in ubuntu deployment
- disable ci jobs of Brahmaputra
- use huawei-pod1 instead untill intel8 back to online
JIRA: COMPASS-393
Change-Id: I76245d8c5f650ee85664d86fe4d9da1ca2c6e76a
Signed-off-by: meimei <meimei@huawei.com>
Diffstat (limited to 'jjb/compass4nfv/compass-deploy.sh')
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 790d43b87..098cfe99d 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -24,12 +24,19 @@ echo 1 > /proc/sys/vm/drop_caches export CONFDIR=$WORKSPACE/deploy/conf export ISO_URL=file://$BUILD_DIRECTORY/compass.iso + +if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]] + export NETWORK_CONF_FILE=network_ocl.yml +else + export NETWORK_CONF_FILE=network.yml +fi + if [[ "$NODE_NAME" =~ "-virtual" ]]; then - export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/network.yml + export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/${NETWORK_CONF_FILE} export DHA_CONF=$CONFDIR/vm_environment/${DEPLOY_SCENARIO}.yml else export INSTALL_NIC=eth1 - export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/network.yml + export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${NETWORK_CONF_FILE} export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${DEPLOY_SCENARIO}.yml fi |