Revert "Integrate the Distribution Sanity Test with the build" 26/1726/2
authorGiovanni Meo <gmeo@cisco.com>
Mon, 7 Oct 2013 15:18:21 +0000 (15:18 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 7 Oct 2013 15:37:16 +0000 (15:37 +0000)
It failed merge the patch is not behaving well.
This reverts commit d78e985bc4ed590407c8c7800ba796d5ea55aa6c.

Change-Id: Id2d3a6215f7373165217ad92dfda7a4e9b07d7d8
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
opendaylight/distribution/opendaylight/pom.xml
opendaylight/distribution/opendaylight/run.sh [deleted file]
opendaylight/distribution/opendaylight/src/assemble/bin.xml
opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/sanitytest/internal/Activator.java

index 92e91f4..cdba77a 100644 (file)
     <module>../../commons/checkstyle</module>
     <module>../../commons/opendaylight</module>
     <module>../../commons/parent</module>
-
-
-    <module>../sanitytest</module>
   </modules>
 
   <build>
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2.1</version>
-        <executions>
-          <execution>
-            <id>sanity-test</id>
-            <phase>package</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <executable>./run.sh</executable>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/opendaylight/distribution/opendaylight/run.sh b/opendaylight/distribution/opendaylight/run.sh
deleted file mode 100755 (executable)
index e23552d..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cp ../sanitytest/target/sanitytest-0.4.1-SNAPSHOT.jar ./target/distribution.opendaylight-osgipackage/opendaylight/plugins
-pushd ./target/distribution.opendaylight-osgipackage/opendaylight/
-./run.sh
-success=`echo $?`
-popd
-rm ./target/distribution.opendaylight-osgipackage/opendaylight/plugins/sanitytest-0.4.1-SNAPSHOT.jar
-exit $success
-
index 7a2be8f..92a718b 100644 (file)
@@ -19,7 +19,6 @@
         <exclude>org.opendaylight.controller:hosttracker_new</exclude>
         <exclude>org.opendaylight.controller:hosttracker_new.implementation</exclude>
         <exclude>org.opendaylight.controller:checkstyle</exclude>
-        <exclude>org.opendaylight.controller:sanitytest</exclude>
       </excludes>
       <binaries>
         <outputDirectory>opendaylight/plugins</outputDirectory>
index 65bc380..262884f 100644 (file)
@@ -27,13 +27,14 @@ public class Activator implements BundleActivator {
 
     public void start(final BundleContext bundleContext) throws Exception {
         Timer monitorTimer = new Timer("monitor timer", true);
+
         monitorTimer.schedule(new TimerTask() {
             @Override
             public void run() {
                 boolean failed = false;
                 for(Bundle bundle : bundleContext.getBundles()){
                     if(bundle.getState() != Bundle.ACTIVE && bundle.getState() != Bundle.RESOLVED) {
-                        System.out.println("------ Failed to activate/resolve bundle = " + bundle.getSymbolicName() + " state = " + stateToString(bundle.getState()));
+                        System.out.println("Failed to activate/resolve bundle = " + bundle.getSymbolicName() + " state = " + stateToString(bundle.getState()));
                         failed = true;
                     }
                 }