for line in $( grep -E -v '(^[[:space:]]*#|^[[:space:]]*$)' "${type}plan.txt" ); do
printf "Executing %s...\\n" "${line}"
# shellcheck source=${line} disable=SC1091
- source "${line}"
+ . "${line}"
done
fi
printf "Finished running %s plans\\n" "${type}"
# Create the string for nodes
for i in $(seq 1 "${NUM_ODL_SYSTEM}") ; do
CONTROLLERIP=ODL_SYSTEM_${i}_IP
- nodes[$i]=${!CONTROLLERIP}
+ nodes[i]=${!CONTROLLERIP}
done
nodes_list=$(join "${nodes[@]}")
fi
FEATURE_TEST_STRING="features-test"
+FEATURE_TEST_VERSION="$BUNDLE_VERSION"
KARAF_VERSION=${KARAF_VERSION:-karaf4}
# only manipulate feature repo in integration distro
if [[ "$KARAF_PROJECT" == "integration" ]]; then
- sed -ie "s%\\(featuresRepositories=\\|featuresRepositories =\\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.2.0/xml/features,%g" ${FEATURESCONF}
+ sed -ie "s%\\(featuresRepositories=\\|featuresRepositories =\\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/\${FEATURE_TEST_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.2.0/xml/features,%g" ${FEATURESCONF}
if [[ ! -z "${REPO_URL}" ]]; then
sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
fi