Skip to content

Commit 993afdb

Browse files
author
Prasanna Santhanam
committed
ignore the tests looking for db
These tests require DB to be present to do upgrade. Revisit later. Signed-off-by: Prasanna Santhanam <tsp@apache.org>
1 parent e5c542a commit 993afdb

2 files changed

Lines changed: 27 additions & 1 deletion

File tree

server/pom.xml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,40 @@
106106
<testResources>
107107
<testResource>
108108
<directory>test/resources</directory>
109+
<excludes>
110+
<exclude>%regex[.*[0-9]*To[0-9]*.*Test.*]</exclude>
111+
</excludes>
109112
</testResource>
110113
</testResources>
111114
<plugins>
115+
<plugin>
116+
<groupId>org.apache.maven.plugins</groupId>
117+
<artifactId>maven-compiler-plugin</artifactId>
118+
<executions>
119+
<execution>
120+
<id>default-testCompile</id>
121+
<phase>test-compile</phase>
122+
<configuration>
123+
<testExcludes>
124+
<exclude>**/com/cloud/upgrade/*.java</exclude>
125+
<exclude>**/com/cloud/async/*.java</exclude>
126+
</testExcludes>
127+
</configuration>
128+
<goals>
129+
<goal>testCompile</goal>
130+
</goals>
131+
</execution>
132+
</executions>
133+
</plugin>
112134
<plugin>
113135
<groupId>org.apache.maven.plugins</groupId>
114136
<artifactId>maven-surefire-plugin</artifactId>
115137
<configuration>
116138
<argLine>-Xmx1024m</argLine>
117139
<excludes>
118-
<exclude>com/cloud/upgrade/*</exclude>
140+
<exclude>%regex[.*[0-9]*To[0-9]*.*Test.*]</exclude>
141+
<exclude>com/cloud/upgrade/AdvanceZone223To224UpgradeTest</exclude>
142+
<exclude>com/cloud/upgrade/AdvanceZone217To224UpgradeTest</exclude>
119143
<exclude>com/cloud/async/*</exclude>
120144
<exclude>com/cloud/cluster/*</exclude>
121145
<exclude>com/cloud/snapshot/*</exclude>

server/test/com/cloud/upgrade/DbUpgrade22Test.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616
// under the License.
1717
package com.cloud.upgrade;
1818

19+
import org.junit.Ignore;
1920
import org.junit.runner.RunWith;
2021
import org.junit.runners.Suite;
2122

2223
@RunWith(Suite.class)
2324
@Suite.SuiteClasses({ AdvanceZone217To224UpgradeTest.class, AdvanceZone223To224UpgradeTest.class, PortForwarding218To224UpgradeTest.class, InstanceGroup218To224UpgradeTest.class,
2425
BasicZone218To224UpgradeTest.class, UsageEvents218To224UpgradeTest.class })
26+
@Ignore("maven-sure-fire discovered")
2527
public class DbUpgrade22Test {
2628

2729
}

0 commit comments

Comments
 (0)