Skip to content

Commit ed2ea41

Browse files
vam-googlevam-google
authored
GAE (Flex_Java/Flex_Custom/Flex_Compat/Std_Java8), GCE, GKE testing app for gcj (#1859)
Appengine tests for #1752
1 parent 67874a7 commit ed2ea41

File tree

22 files changed

+789
-1
lines changed

22 files changed

+789
-1
lines changed

‎pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,15 @@
120120
<module>google-cloud-trace</module>
121121
<module>google-cloud-translate</module>
122122
<module>google-cloud-vision</module>
123+
<!--
124+
Uncomment the following lines to include google app engine (GAE) testing apps in the build.
125+
Each GAE app packages all its dependencies in a fat war (>20MB each).
126+
-->
127+
<!--<module>testing/google-cloud-managed-test</module>-->
128+
<!--<module>testing/google-cloud-appengine-flex-java</module>-->
129+
<!--<module>testing/google-cloud-appengine-flex-custom</module>-->
130+
<!--<module>testing/google-cloud-appengine-java8</module>-->
131+
<!--<module>testing/google-cloud-appengine-flex-compat</module>-->
123132
</modules>
124133
<pluginRepositories>
125134
<pluginRepository>

‎testing/google-cloud-appengine-flex-compat/pom.xml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>google-cloud-pom</artifactId>
7+
<groupId>com.google.cloud</groupId>
8+
<version>0.11.2-alpha-SNAPSHOT</version>
9+
<relativePath>../..</relativePath>
10+
</parent>
11+
12+
<modelVersion>4.0.0</modelVersion>
13+
<packaging>war</packaging>
14+
<artifactId>google-cloud-appengine-flex-compat</artifactId>
15+
16+
<properties>
17+
<appengine.sdk.version>1.9.51</appengine.sdk.version>
18+
<appengine.maven.plugin>1.2.1</appengine.maven.plugin>
19+
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>
20+
<java.source.version>1.7</java.source.version>
21+
</properties>
22+
23+
<dependencies>
24+
<dependency>
25+
<groupId>${project.groupId}</groupId>
26+
<artifactId>google-cloud-managed-test</artifactId>
27+
<version>${project.version}</version>
28+
</dependency>
29+
<dependency>
30+
<groupId>com.google.appengine</groupId>
31+
<artifactId>appengine-api-1.0-sdk</artifactId>
32+
<version>${appengine.sdk.version}</version>
33+
</dependency>
34+
</dependencies>
35+
36+
<build>
37+
<outputDirectory>
38+
${project.build.directory}/${project.build.finalName}/WEB-INF/classes
39+
</outputDirectory>
40+
41+
<plugins>
42+
<plugin>
43+
<groupId>org.eclipse.jetty</groupId>
44+
<artifactId>jetty-maven-plugin</artifactId>
45+
<version>${jetty.maven.plugin}</version>
46+
</plugin>
47+
48+
<plugin>
49+
<groupId>org.apache.maven.plugins</groupId>
50+
<version>3.3</version>
51+
<artifactId>maven-compiler-plugin</artifactId>
52+
<configuration>
53+
<source>${java.source.version}</source>
54+
<target>${java.source.version}</target>
55+
</configuration>
56+
</plugin>
57+
<plugin>
58+
<groupId>com.google.cloud.tools</groupId>
59+
<artifactId>appengine-maven-plugin</artifactId>
60+
<version>${appengine.maven.plugin}</version>
61+
<configuration>
62+
<deploy.version>1</deploy.version>
63+
</configuration>
64+
</plugin>
65+
</plugins>
66+
</build>
67+
</project>

‎testing/google-cloud-appengine-flex-compat/src/main/webapp/WEB-INF/appengine-web.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
3+
<application>GCLOUD_PROJECT_ID_HERE</application>
4+
<service>flex-compat</service>
5+
<version>1</version>
6+
<threadsafe>true</threadsafe>
7+
<env>flex</env>
8+
<beta-settings>
9+
<setting name="enable_app_engine_apis" value="true"/>
10+
</beta-settings>
11+
<manual-scaling>
12+
<instances>1</instances>
13+
</manual-scaling>
14+
<resources>
15+
<cpu>1</cpu>
16+
<memory-gb>4</memory-gb>
17+
</resources>
18+
</appengine-web-app>

‎testing/google-cloud-appengine-flex-compat/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
5+
version="3.1">
6+
</web-app>

‎testing/google-cloud-appengine-flex-compat/src/main/webapp/index.html‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<html>
2+
<title>google-cloud-java managed environments tests executor</title>
3+
<body>
4+
<p>Enter fully qualified test class names to execute. One class per line, use '#' for comments.</p>
5+
<form method="POST" action="/test">
6+
<label>
7+
<textarea name="classes" cols="50" rows="10">#com.google.cloud.storage.BlobIdTest</textarea>
8+
</label>
9+
<br/>
10+
<input type="submit"/>
11+
</form>
12+
</body>
13+
</html>

‎testing/google-cloud-appengine-flex-custom/pom.xml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>google-cloud-pom</artifactId>
7+
<groupId>com.google.cloud</groupId>
8+
<version>0.11.2-alpha-SNAPSHOT</version>
9+
<relativePath>../..</relativePath>
10+
</parent>
11+
12+
<modelVersion>4.0.0</modelVersion>
13+
<packaging>war</packaging>
14+
<artifactId>google-cloud-appengine-flex-custom</artifactId>
15+
16+
<properties>
17+
<appengine.maven.plugin>1.2.1</appengine.maven.plugin>
18+
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>
19+
</properties>
20+
21+
<dependencies>
22+
<dependency>
23+
<groupId>${project.groupId}</groupId>
24+
<artifactId>google-cloud-managed-test</artifactId>
25+
<version>${project.version}</version>
26+
</dependency>
27+
</dependencies>
28+
29+
<build>
30+
<outputDirectory>
31+
${project.build.directory}/${project.build.finalName}/WEB-INF/classes
32+
</outputDirectory>
33+
34+
<plugins>
35+
<plugin>
36+
<groupId>org.eclipse.jetty</groupId>
37+
<artifactId>jetty-maven-plugin</artifactId>
38+
<version>${jetty.maven.plugin}</version>
39+
</plugin>
40+
41+
<plugin>
42+
<groupId>com.google.cloud.tools</groupId>
43+
<artifactId>appengine-maven-plugin</artifactId>
44+
<version>${appengine.maven.plugin}</version>
45+
<configuration>
46+
<deploy.version>1</deploy.version>
47+
</configuration>
48+
</plugin>
49+
</plugins>
50+
</build>
51+
</project>

‎testing/google-cloud-appengine-flex-custom/src/main/appengine/app.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
runtime: custom
2+
env: flex
3+
4+
handlers:
5+
- url: /.*
6+
script: this field is required, but ignored
7+
8+
service: flex-custom
9+
10+
manual_scaling:
11+
instances: 1
12+
13+
resources:
14+
cpu: 1
15+
memory_gb: 6

‎testing/google-cloud-appengine-flex-custom/src/main/docker/Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
FROM gcr.io/google_appengine/jetty
2+
ADD google-cloud-appengine-flex-custom-0.11.2-alpha-SNAPSHOT.war $JETTY_BASE/webapps/root.war

‎testing/google-cloud-appengine-flex-custom/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
5+
version="3.1">
6+
</web-app>

‎testing/google-cloud-appengine-flex-custom/src/main/webapp/index.html‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<html>
2+
<title>google-cloud-java managed environments tests executor</title>
3+
<body>
4+
<p>Enter fully qualified test class names to execute. One class per line, use '#' for comments.</p>
5+
<form method="POST" action="/test">
6+
<label>
7+
<textarea name="classes" cols="50" rows="10">#com.google.cloud.storage.BlobIdTest</textarea>
8+
</label>
9+
<br/>
10+
<input type="submit"/>
11+
</form>
12+
</body>
13+
</html>

0 commit comments

Comments
 (0)