CONTROLLER-1811: Fix IT hang in startup archetype

The IT uses the local karaf distro which adds the feature to
the featuresBoot which seems to cause an issue as the test code
also installs the feature. I also changed the test to just install
the impl feature and not the rest feature as the latter is not needed
for IT.

Change-Id: I471c1c1bef444f528f2703b0931416fb3dfcf6cd
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml
index 6115ec4f132100e3b80a8eb14309d853b8cc0bc6..6bb8e7a645c59843172c3ffb1578d65c7d7a3068 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml
@@ -26,10 +26,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <properties>
     <skipITs>false</skipITs>
 
   <properties>
     <skipITs>false</skipITs>

-    <karaf.distro.groupId>${groupId}</karaf.distro.groupId>
-    <karaf.distro.artifactId>${artifactId}-karaf</karaf.distro.artifactId>
-    <karaf.distro.version>${version}</karaf.distro.version>
-    <karaf.distro.type>zip</karaf.distro.type>

   </properties>
 
   <dependencies>
   </properties>
 
   <dependencies>

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__Test.java b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__Test.java
index 6f983957b6bc7d4d8fbd8cb054238256d83853e3..cae79de164cfffba60461082d3ec91950377ff41 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__Test.java
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__Test.java
@@ -45,7 +45,7 @@ public class ${classPrefix}Test extends AbstractMdsalTestBase {
 
     @Override
     public String getFeatureName() {
 
     @Override
     public String getFeatureName() {

-        return "odl-${artifactId}-rest";
+        return "odl-${artifactId}";

     }
 
     @Override
     }
 
     @Override


@@ -58,7 +58,6 @@ public class ${classPrefix}Test extends AbstractMdsalTestBase {
     }
 
     @Test
     }
 
     @Test

-    @Ignore // TODO https://jira.opendaylight.org/browse/CONTROLLER-1810

     public void test${artifactId}FeatureLoad() {
         Assert.assertTrue(true);
     }
     public void test${artifactId}FeatureLoad() {
         Assert.assertTrue(true);
     }

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
index 98a8ab6e60cb1d8f2999fea7dcedf3cdf0968ec4..3d6ef2fccec1330a7cb4f204997837e2909600ed 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
@@ -35,7 +35,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <module>features</module>
     <module>artifacts</module>
     <module>cli</module>
     <module>features</module>
     <module>artifacts</module>
     <module>cli</module>

-    <!-- TODO CONTROLLER-1811 *and* then CONTROLLER-1810: <module>it</module> -->
+    <module>it</module>

   </modules>
 
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   </modules>
 
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->