Merge remote-tracking branch 'origin/4.17'

This commit is contained in:
Rohit Yadav 2022-09-12 21:30:03 +05:30
commit 68c09f92d1
7 changed files with 7 additions and 7 deletions

View File

@ -46,7 +46,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx1024m</argLine>
<argLine>@{argLine} -Xmx1024m</argLine>
<excludes>
<exclude>org/apache/cloudstack/discovery/integration/*</exclude>
</excludes>

View File

@ -34,7 +34,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>always</forkMode>
<argLine>-Xmx2048m -XX:MaxPermSize=1024m</argLine>
<argLine>@{argLine} -Xmx2048m -XX:MaxPermSize=1024m</argLine>
<excludes>
<exclude>org/apache/cloudstack/ratelimit/integration/*</exclude>
</excludes>

View File

@ -40,7 +40,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx1024m</argLine>
<argLine>@{argLine} -Xmx1024m</argLine>
<excludes>
<exclude>org/apache/cloudstack/solidfire/integration/*</exclude>
</excludes>

View File

@ -46,7 +46,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx1024m</argLine>
<argLine>@{argLine} -Xmx1024m</argLine>
</configuration>
</plugin>
</plugins>

View File

@ -45,7 +45,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx1024m</argLine>
<argLine>@{argLine} -Xmx1024m</argLine>
</configuration>
</plugin>
</plugins>

View File

@ -136,7 +136,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>always</forkMode>
<argLine>-Xmx1024m</argLine>
<argLine>@{argLine} -Xmx1024m</argLine>
<excludes>
<exclude>**/NetworkProviderTest.java</exclude>
<exclude>**/PublicNetworkTest.java</exclude>

View File

@ -206,7 +206,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx2048m -XX:MaxPermSize=512m -Djava.security.egd=file:/dev/./urandom</argLine>
<argLine>@{argLine} -Xmx2048m -XX:MaxPermSize=512m -Djava.security.egd=file:/dev/./urandom</argLine>
<excludes>
<exclude>%regex[.*[0-9]*To[0-9]*.*Test.*]</exclude>
<exclude>com/cloud/upgrade/AdvanceZone223To224UpgradeTest</exclude>