Integration 3nodes: Fix ${CONTROLLERFEAT} when scope is not all

Adresses a comment in
https://git.opendaylight.org/gerrit/#/c/18353/12/jjb/integration/include-raw-integration-get-bundle-vars.sh
which was causing ${scope} == only test jobs to fail.

Change-Id: Ifcaf11e722560734103eed1332304557e97ccba9
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/integration/include-raw-integration-get-bundle-vars.sh b/jjb/integration/include-raw-integration-get-bundle-vars.sh
index 1698578db8deb9ef08cf306b018dbb1f8dfb6c1c..6cf3f5133119a26146e6dcb9bed6dbe5ed1f9e8c 100644 (file)
--- a/jjb/integration/include-raw-integration-get-bundle-vars.sh
+++ b/jjb/integration/include-raw-integration-get-bundle-vars.sh
@@ -11,6 +11,8 @@ DISTRIBUTION="karaf"
 if [ ${CONTROLLERSCOPE} == 'all' ]; then
     CONTROLLERFEAT="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
     CONTROLLERMEM="3072m"
+else
+    CONTROLLERFEAT="${CONTROLLERFEATURES}"
 fi
 
 NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}