Sync sft.diag.force for Karaf 4

Change-Id: I3e8c97d8f43f016e5b1cead856012bed74f6aac2
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features4-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java b/features4-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
index c29106245491c2ac43c42d48445be37642dccfb6..47c7962218d62a09de96e7e70724488e1e7a76cc 100644 (file)
--- a/features4-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
+++ b/features4-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
@@ -63,6 +63,7 @@ public class SingleFeatureTest {
     private static final String KEEP_UNPACK_DIRECTORY_PROP = "karaf.keep.unpack";
     private static final String PROFILE_PROP = "karaf.featureTest.profile";
     private static final String BUNDLES_DIAG_SKIP_PROP = "sft.diag.skip";
+    private static final String BUNDLES_DIAG_FORCE_PROP = "sft.diag.force";
     private static final String BUNDLES_DIAG_TIMEOUT_PROP = "sft.diag.timeout";
 
     private static final String LOG4J_LOGGER_ORG_OPENDAYLIGHT_YANGTOOLS_FEATURETEST =
@@ -187,6 +188,7 @@ public class SingleFeatureTest {
             propagateSystemProperty(ORG_OPENDAYLIGHT_FEATURETEST_FEATURENAME_PROP),
             propagateSystemProperty(ORG_OPENDAYLIGHT_FEATURETEST_FEATUREVERSION_PROP),
             propagateSystemProperty(BUNDLES_DIAG_SKIP_PROP),
+            propagateSystemProperty(BUNDLES_DIAG_FORCE_PROP),
             propagateSystemProperty(BUNDLES_DIAG_TIMEOUT_PROP),
             // Needed for Agrona/aeron.io
             systemPackages("com.sun.media.sound", "sun.nio.ch"),
@@ -322,7 +324,8 @@ public class SingleFeatureTest {
         LOG.info("Successfull installed feature {} {}", getFeatureName(), getFeatureVersion());
 
         if (!Boolean.getBoolean(BUNDLES_DIAG_SKIP_PROP)
-                && !BLACKLISTED_BROKEN_FEATURES.contains(getFeatureName())) {
+                && (Boolean.getBoolean(BUNDLES_DIAG_FORCE_PROP)
+                    || !BLACKLISTED_BROKEN_FEATURES.contains(getFeatureName()))) {
             Integer timeOutInSeconds = Integer.getInteger(BUNDLES_DIAG_TIMEOUT_PROP, 5 * 60);
             new TestBundleDiag(bundleContext, bundleService).checkBundleDiagInfos(timeOutInSeconds, SECONDS);
         } else {