Skip to content

Commit 426a8dc

Browse files
snicollsnicoll
committed
Store container installs in home directory
Previously, deployment tests were storing the container archives in the default location (that is `/tmp`) for a total weight of 160MB. In case the temp directory is cleaned on CI, these have to be downloaded again. We're now configuring cargo to store these archives in the home directory instead. This should improve the speed and the stability of the deployment tests Closes spring-projectsgh-3861
1 parent 8a96481 commit 426a8dc

File tree

4 files changed

+61
-96
lines changed
  • spring-boot-deployment-tests

4 files changed

+61
-96
lines changed

‎spring-boot-deployment-tests/pom.xml

+50
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,60 @@
1919
<properties>
2020
<main.basedir>${basedir}/..</main.basedir>
2121
<java.version>1.7</java.version>
22+
23+
<cargo.timeout>300000</cargo.timeout>
24+
<cargo.container.download-dir>${user.home}/.cargo/installs</cargo.container.download-dir>
2225
</properties>
2326
<modules>
2427
<module>spring-boot-deployment-test-tomee</module>
2528
<module>spring-boot-deployment-test-tomcat</module>
2629
<module>spring-boot-deployment-test-wildfly</module>
2730
</modules>
31+
32+
<build>
33+
<pluginManagement>
34+
<plugins>
35+
<plugin>
36+
<groupId>org.codehaus.cargo</groupId>
37+
<artifactId>cargo-maven2-plugin</artifactId>
38+
<configuration>
39+
<container>
40+
<containerId>${cargo.container.id}</containerId>
41+
<timeout>${cargo.timeout}</timeout>
42+
<zipUrlInstaller>
43+
<url>${cargo.container.url}</url>
44+
<downloadDir>${cargo.container.download-dir}</downloadDir>
45+
</zipUrlInstaller>
46+
</container>
47+
<deployables>
48+
<deployable>
49+
<properties>
50+
<context>/bootapp</context>
51+
</properties>
52+
<pingURL>http://localhost:${appserver.port}/bootapp</pingURL>
53+
<pingTimeout>30000</pingTimeout>
54+
</deployable>
55+
</deployables>
56+
</configuration>
57+
<executions>
58+
<execution>
59+
<id>start-cargo</id>
60+
<phase>pre-integration-test</phase>
61+
<goals>
62+
<goal>start</goal>
63+
</goals>
64+
</execution>
65+
<execution>
66+
<id>stop-cargo</id>
67+
<phase>post-integration-test</phase>
68+
<goals>
69+
<goal>stop</goal>
70+
</goals>
71+
</execution>
72+
</executions>
73+
</plugin>
74+
</plugins>
75+
</pluginManagement>
76+
</build>
77+
2878
</project>

‎spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml

+4-32
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
</organization>
1818
<properties>
1919
<main.basedir>${basedir}/../..</main.basedir>
20+
<cargo.container.id>tomcat8x</cargo.container.id>
21+
<cargo.container.url>
22+
http://mirrors.ibiblio.org/apache/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip
23+
</cargo.container.url>
2024
</properties>
2125
<dependencies>
2226
<dependency>
@@ -60,45 +64,13 @@
6064
<groupId>org.codehaus.cargo</groupId>
6165
<artifactId>cargo-maven2-plugin</artifactId>
6266
<configuration>
63-
<container>
64-
<containerId>tomcat8x</containerId>
65-
<timeout>300000</timeout>
66-
<zipUrlInstaller>
67-
<url>http://mirrors.ibiblio.org/apache/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
68-
</zipUrlInstaller>
69-
</container>
7067
<configuration>
7168
<properties>
7269
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
7370
<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
7471
</properties>
7572
</configuration>
76-
<deployables>
77-
<deployable>
78-
<properties>
79-
<context>/bootapp</context>
80-
</properties>
81-
<pingURL>http://localhost:${appserver.port}/bootapp</pingURL>
82-
<pingTimeout>30000</pingTimeout>
83-
</deployable>
84-
</deployables>
8573
</configuration>
86-
<executions>
87-
<execution>
88-
<id>start-cargo</id>
89-
<phase>pre-integration-test</phase>
90-
<goals>
91-
<goal>start</goal>
92-
</goals>
93-
</execution>
94-
<execution>
95-
<id>stop-cargo</id>
96-
<phase>post-integration-test</phase>
97-
<goals>
98-
<goal>stop</goal>
99-
</goals>
100-
</execution>
101-
</executions>
10274
</plugin>
10375
<plugin>
10476
<groupId>org.apache.maven.plugins</groupId>

‎spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml

+4-32
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
<properties>
1919
<main.basedir>${basedir}/../..</main.basedir>
2020
<tomee.version>1.7.1</tomee.version>
21+
<cargo.container.id>tomee1x</cargo.container.id>
22+
<cargo.container.url>
23+
http://mirrors.ibiblio.org/apache/tomee/tomee-${tomee.version}/apache-tomee-${tomee.version}-webprofile.zip
24+
</cargo.container.url>
2125
</properties>
2226
<dependencies>
2327
<dependency>
@@ -65,45 +69,13 @@
6569
<groupId>org.codehaus.cargo</groupId>
6670
<artifactId>cargo-maven2-plugin</artifactId>
6771
<configuration>
68-
<container>
69-
<containerId>tomee1x</containerId>
70-
<timeout>300000</timeout>
71-
<zipUrlInstaller>
72-
<url>http://mirrors.ibiblio.org/apache/tomee/tomee-${tomee.version}/apache-tomee-${tomee.version}-webprofile.zip</url>
73-
</zipUrlInstaller>
74-
</container>
7572
<configuration>
7673
<properties>
7774
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
7875
<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
7976
</properties>
8077
</configuration>
81-
<deployables>
82-
<deployable>
83-
<properties>
84-
<context>/bootapp</context>
85-
</properties>
86-
<pingURL>http://localhost:${appserver.port}/bootapp</pingURL>
87-
<pingTimeout>30000</pingTimeout>
88-
</deployable>
89-
</deployables>
9078
</configuration>
91-
<executions>
92-
<execution>
93-
<id>start-cargo</id>
94-
<phase>pre-integration-test</phase>
95-
<goals>
96-
<goal>start</goal>
97-
</goals>
98-
</execution>
99-
<execution>
100-
<id>stop-cargo</id>
101-
<phase>post-integration-test</phase>
102-
<goals>
103-
<goal>stop</goal>
104-
</goals>
105-
</execution>
106-
</executions>
10779
</plugin>
10880
<plugin>
10981
<groupId>org.apache.maven.plugins</groupId>

‎spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml

+3-32
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
<properties>
1919
<main.basedir>${basedir}/../..</main.basedir>
2020
<wildfly.version>8.2.0.Final</wildfly.version>
21+
<cargo.container.id>wildfly8x</cargo.container.id>
22+
<cargo.container.url>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip
23+
</cargo.container.url>
2124
</properties>
2225
<dependencies>
2326
<dependency>
@@ -62,13 +65,6 @@
6265
<groupId>org.codehaus.cargo</groupId>
6366
<artifactId>cargo-maven2-plugin</artifactId>
6467
<configuration>
65-
<container>
66-
<containerId>wildfly8x</containerId>
67-
<timeout>300000</timeout>
68-
<zipUrlInstaller>
69-
<url>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip</url>
70-
</zipUrlInstaller>
71-
</container>
7268
<configuration>
7369
<properties>
7470
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
@@ -79,32 +75,7 @@
7975
<cargo.jboss.configuration>standalone-full</cargo.jboss.configuration>
8076
</properties>
8177
</configuration>
82-
<deployables>
83-
<deployable>
84-
<properties>
85-
<context>/bootapp</context>
86-
</properties>
87-
<pingURL>http://localhost:${appserver.port}/bootapp</pingURL>
88-
<pingTimeout>30000</pingTimeout>
89-
</deployable>
90-
</deployables>
9178
</configuration>
92-
<executions>
93-
<execution>
94-
<id>start-cargo</id>
95-
<phase>pre-integration-test</phase>
96-
<goals>
97-
<goal>start</goal>
98-
</goals>
99-
</execution>
100-
<execution>
101-
<id>stop-cargo</id>
102-
<phase>post-integration-test</phase>
103-
<goals>
104-
<goal>stop</goal>
105-
</goals>
106-
</execution>
107-
</executions>
10879
</plugin>
10980
<plugin>
11081
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)