add job definition based on existing apex cperf runner template

[releng.git] / jjb / compass4nfv / compass-deploy.sh

diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index 860f5da..0231ea5 100644 (file)
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -24,12 +24,21 @@ echo 1 > /proc/sys/vm/drop_caches
 
 export CONFDIR=$WORKSPACE/deploy/conf
 export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
-if [[ "$NODE_NAME" =~ "-vm" ]]; then
-    export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/network.yml
+
+if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then
+    export NETWORK_CONF_FILE=network_ocl.yml
+elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then
+    export NETWORK_CONF_FILE=network_onos.yml
+else
+    export NETWORK_CONF_FILE=network.yml
+fi
+
+if [[ "$NODE_NAME" =~ "-virtual" ]]; then
+    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
 
@@ -37,6 +46,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}
+fi
 ./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF}
 if [ $? -ne 0 ]; then
     echo "depolyment failed!"