CONTROLLER-1811: Fix IT hang in startup archetype 11/67511/2
authorTom Pantelis <tompantelis@gmail.com>
Tue, 23 Jan 2018 16:27:08 +0000 (11:27 -0500)
committerTom Pantelis <tompantelis@gmail.com>
Tue, 23 Jan 2018 17:49:20 +0000 (12:49 -0500)
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>
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__Test.java
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml

index 6115ec4..6bb8e7a 100644 (file)
@@ -26,10 +26,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <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>
index 6f98395..cae79de 100644 (file)
@@ -45,7 +45,7 @@ public class ${classPrefix}Test extends AbstractMdsalTestBase {
 
     @Override
     public String getFeatureName() {
-        return "odl-${artifactId}-rest";
+        return "odl-${artifactId}";
     }
 
     @Override
@@ -58,7 +58,6 @@ public class ${classPrefix}Test extends AbstractMdsalTestBase {
     }
 
     @Test
-    @Ignore // TODO https://jira.opendaylight.org/browse/CONTROLLER-1810
     public void test${artifactId}FeatureLoad() {
         Assert.assertTrue(true);
     }
index 98a8ab6..3d6ef2f 100644 (file)
@@ -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>
-    <!-- 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 -->

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.