Remove extra space between feature repos

[releng/builder.git] / jjb / integration / integration-configure-clustering.sh

diff --git a/jjb/integration/integration-configure-clustering.sh b/jjb/integration/integration-configure-clustering.sh
index 8f7a8080461b2f09cab8064ef397293abc475c91..619f3c311853fefca6fd877d764e1eacb9f1ec39 100644 (file)
--- a/jjb/integration/integration-configure-clustering.sh
+++ b/jjb/integration/integration-configure-clustering.sh
@@ -44,18 +44,6 @@ echo ${nodes_list}
 
 run_plan "script"
 
-# Run script plan in case it exists
-if [ -f ${WORKSPACE}/test/csit/scriptplans/${TESTPLAN} ]; then
-    echo "scriptplan exists!!!"
-    echo "Reading the scriptplan:"
-    cat ${WORKSPACE}/test/csit/scriptplans/${TESTPLAN} | sed "s:integration:${WORKSPACE}:" > scriptplan.txt
-    cat scriptplan.txt
-    for line in $( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' scriptplan.txt ); do
-        echo "Executing ${line}..."
-        source ${line}
-    done
-fi
-
 # Create the configuration script to be run on controllers.
 cat > ${WORKSPACE}/configuration-script.sh <<EOF
 set -x
@@ -88,12 +76,6 @@ if [[ ! -z "${REPO_URL}" ]]; then
 fi
 cat ${FEATURESCONF}
 
-if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
-  echo "Enable the l3.fwd in custom.properties.."
-  echo "ovsdb.l3.fwd.enabled=yes" >> ${CUSTOMPROP}
-  cat ${CUSTOMPROP}
-fi
-
 configure_karaf_log "${KARAF_VERSION}" "${CONTROLLERDEBUGMAP}"
 
 set_java_vars "${JAVA_HOME}" "${CONTROLLERMEM}" "${MEMCONF}"