From: Ed Warnicke <eaw@cisco.com>
Date: Fri, 13 Dec 2013 15:05:58 +0000 (+0000)
Subject: Merge "This sanity test is sporatically failing in Jenkins for no good reason.  Rever... 
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~197
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=213aae87ecaccb43f3d909e0455db43511ace381;hp=-c

Merge "This sanity test is sporatically failing in Jenkins for no good reason.  Reverting to restabalize "
---

213aae87ecaccb43f3d909e0455db43511ace381
diff --combined opendaylight/distribution/opendaylight/pom.xml
index b7a4638c60,4c0b81f7d7..e519a04a57
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@@ -223,21 -223,11 +223,21 @@@
            <artifactId>config-persister-file-adapter</artifactId>
            <version>${config.version}</version>
          </dependency>
 -          <dependency>
 -              <groupId>org.opendaylight.controller</groupId>
 -              <artifactId>config-persister-directory-adapter</artifactId>
 -              <version>${config.version}</version>
 -          </dependency>
 +        <dependency>
 +          <groupId>org.opendaylight.controller</groupId>
 +          <artifactId>config-persister-file-xml-adapter</artifactId>
 +          <version>${config.version}</version>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.opendaylight.controller</groupId>
 +          <artifactId>config-persister-directory-adapter</artifactId>
 +          <version>${config.version}</version>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.opendaylight.controller</groupId>
 +          <artifactId>config-persister-directory-xml-adapter</artifactId>
 +          <version>${config.version}</version>
 +        </dependency>
  
         <!-- Netconf -->
          <dependency>
@@@ -471,7 -461,6 +471,6 @@@
        </dependencies>
      </profile>
      <profile>
-       <!-- sanitytests are only enabled with this profile -->
        <id>integrationtests</id>
        <activation>
          <activeByDefault>false</activeByDefault>
@@@ -480,41 -469,57 +479,57 @@@
          <plugins>
            <plugin>
              <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-invoker-plugin</artifactId>
-             <version>1.5</version>
+             <artifactId>maven-dependency-plugin</artifactId>
+             <version>2.8</version>
+             <executions>
+               <execution>
+                 <id>copy</id>
+                 <phase>package</phase>
+                 <goals>
+                   <goal>copy</goal>
+                 </goals>
+               </execution>
+             </executions>
              <configuration>
-               <debug>false</debug>
-               <projectsDirectory>../sanitytest</projectsDirectory>
-               <pomIncludes>
-                 <pomInclude>pom.xml</pomInclude>
-               </pomIncludes>
-               <streamLogs>true</streamLogs>
-               <noLog>true</noLog>
-               <goals>
-                 <goal>clean</goal>
-                 <goal>verify</goal>
-               </goals>
-               </configuration>
-               <executions>
-                 <execution>
-                   <id>integration-test</id>
-                     <goals>
-                       <goal>install</goal>
-                       <goal>run</goal>
-                     </goals>
-                 </execution>
-               </executions>
-            </plugin>
+               <artifactItems>
+                 <artifactItem>
+                   <groupId>org.opendaylight.controller</groupId>
+                   <artifactId>sanitytest</artifactId>
+                   <version>${controller.version}</version>
+                   <type>jar</type>
+                 </artifactItem>
+               </artifactItems>
+             </configuration>
+           </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>${java.home}/bin/java</executable>
+               <arguments>
+                 <argument>-cp</argument>
+                 <argument>./target/dependency/*</argument>
+                 <argument>org.opendaylight.controller.distribution.Sanity</argument>
+               </arguments>
+               <environmentVariables>
+                 <JAVA_HOME>
+                   ${java.home}
+                 </JAVA_HOME>
+               </environmentVariables>
+             </configuration>
+           </plugin>
          </plugins>
        </build>
- 
-       <dependencies>
-         <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>controller-maven-plugin</artifactId>
-          <version>0.1.0-SNAPSHOT</version>
-         </dependency>
-       </dependencies>
      </profile>
    </profiles>
  
@@@ -1342,6 -1347,13 +1357,13 @@@
       <version>${commons.httpclient.version}</version>
      </dependency>
  
+     <dependency>
+       <groupId>org.opendaylight.controller</groupId>
+       <artifactId>sanitytest</artifactId>
+       <version>${controller.version}</version>
+     </dependency>
+ 
+ 
    </dependencies>
  
  
@@@ -1384,8 -1396,6 +1406,6 @@@
            </execution>
          </executions>
        </plugin>
- 
      </plugins>
    </build>
- 
  </project>