Merge "Update cloud image CentOS7 devstack x86_64"

[releng/builder.git] / jjb / integration / common-functions.sh

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index 6c967d0cb00c1d18940143b25126de8631bbcd8a..2a647695269965b1c29a117556e64636ed3de930 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -847,7 +847,7 @@ function get_nodes_list() {
     # 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[@]}")
@@ -916,9 +916,6 @@ fi
 
 FEATURE_TEST_STRING="features-test"
 FEATURE_TEST_VERSION="$BUNDLE_VERSION"
-if [[ "$KARAF_ARTIFACT" == "opendaylight" ]]; then
-    FEATURE_TEST_VERSION="$(sed -r "s%^([0-9]+)\.([0-9]+)\.0(.*)%0.\1.\2\3%" <<<"$BUNDLE_VERSION")"
-fi
 KARAF_VERSION=${KARAF_VERSION:-karaf4}
 
 # only manipulate feature repo in integration distro