Merge branch '1.10' into space/14.1-enlinkd

Conflicts: opennms-webapp/src/test/java/org/opennms/web/svclayer/DefaultOutageServiceIntegrationTest.java
OpenNMS · May 19, 2014 · 2c1e921 · 2c1e921
2 parents 0512990 + e899f88
commit 2c1e921
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/...ms-webapp/src/test/java/org/opennms/web/svclayer/DefaultOutageServiceIntegrationTest.java b/...ms-webapp/src/test/java/org/opennms/web/svclayer/DefaultOutageServiceIntegrationTest.java
@@ -102,6 +102,7 @@ public void testGetRangeOutages() {
 
     @Test
     @Transactional
+    @JUnitTemporaryDatabase // Relies on specific IDs so we need a fresh database
     @Ignore
     @JUnitTemporaryDatabase
     public void testGetSupressedOutages() {
@@ -119,6 +120,7 @@ public void testLoadOneOutage() {
 
     @Test
     @Transactional
+    @JUnitTemporaryDatabase // Relies on specific IDs so we need a fresh database
     @Ignore
     @JUnitTemporaryDatabase
     public void testNoOfSuppressedOutages(){

diff --git a/pom.xml b/pom.xml
@@ -1153,13 +1153,26 @@
         <module>opennms-tools</module>
       </modules>
     </profile>
+
     <profile>
       <id>build-bamboo</id>
       <modules>
         <module>opennms-full-assembly</module>
       </modules>
     </profile>
 
+    <profile>
+      <id>smoke</id>
+      <activation>
+        <property>
+          <name>smoke</name>
+        </property>
+      </activation>
+      <modules>
+        <module>smoke-test</module>
+      </modules>
+    </profile>
+
     <profile>
       <id>jdk7+</id>
       <activation>

diff --git a/smoke-test/do-smoke-test.sh b/smoke-test/do-smoke-test.sh
@@ -167,9 +167,12 @@ run_tests() {
 	local RETVAL=0
 	rm -rf ~/.m2/repository/org/opennms
 
-	do_log "bamboo.pl test"
+	do_log "bin/bamboo.pl -Psmoke --projects :smoke-test --also-make install"
+	bin/bamboo.pl -Psmoke --projects :smoke-test --also-make install
+
+	do_log "compile.pl test"
 	pushd "$SOURCEDIR/smoke-test"
-		../bin/bamboo.pl -t -Denable.snapshots=true -DupdatePolicy=always -Dorg.opennms.smoketest.logLevel=INFO test
+		../compile.pl -t -Denable.snapshots=true -DupdatePolicy=always -Dorg.opennms.smoketest.logLevel=INFO test
 		RETVAL=$?
 	popd