Set FEATURE_TEST_STRING to 'features-test'

'features-integration-test' has been long gone:
https://git.opendaylight.org/gerrit/c/integration/distribution/+/58820

Set FEATURE_TEST_STRING to 'features-test' unconditionally to avoid
incorrect feature configuration.

Signed-off-by: Sangwook Ha <[email protected]>
Change-Id: I845c34112303a59f0524cca346708b034612ed68

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index cfd8e39da635c8b36adf41b6380c1e3f4f2b3a56..85c16ee197f12596fa2a3db1e9ffe3804a4fbcee 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -914,11 +914,8 @@ if [[ "$USEFEATURESBOOT" == "True" ]]; then
     sed -ie "s/\\(featuresBoot=\\|featuresBoot =\\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
 fi
 
-FEATURE_TEST_STRING="features-integration-test"
+FEATURE_TEST_STRING="features-test"
 KARAF_VERSION=${KARAF_VERSION:-karaf4}
-if [[ "$KARAF_VERSION" == "karaf4" ]]; then
-    FEATURE_TEST_STRING="features-test"
-fi
 
 # only manipulate feature repo in integration distro
 if [[ "$KARAF_PROJECT" == "integration" ]]; then
@@ -1253,5 +1250,3 @@ function install_ovs_from_path() {
     ${SSH} "${ip}" "sudo yum -y install createrepo && createrepo --database /tmp/ovs_rpms"
     install_ovs_from_repo "${ip}" file:/tmp/ovs_rpms
 }
-
-

diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh
index 1dad0d1f1646de7db1e3fb54478ead1193042d6b..2ed4fa1d8b193e81fc89119026e801a2fd0e1376 100644 (file)
--- a/jjb/integration/distribution/distribution-check-bootup.sh
+++ b/jjb/integration/distribution/distribution-check-bootup.sh
@@ -36,9 +36,6 @@ unzip -q "${BUNDLE}"
 echo "Configuring the startup features..."
 FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
 FEATURE_TEST_STRING="features-test"
-if [[ "$KARAF_VERSION" == "karaf3" ]]; then
-    FEATURE_TEST_STRING="features-integration-test"
-fi
 
 # only replace feature repo in integration/distro, MRI projects need to pull in
 # the features they need by themselves