Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion google-cloud-spanner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<!--<goal>integration-test</goal>-->
<goal>verify</goal>

This comment was marked as spam.

This comment was marked as spam.

</goals>
</execution>
</executions>
Expand Down
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@
<module>google-cloud-trace</module>
<module>google-cloud-translate</module>
<module>google-cloud-vision</module>
<module>testing/google-cloud-managed-test</module>
<module>testing/google-cloud-appengine-flex-java</module>
<module>testing/google-cloud-appengine-flex-custom</module>
<module>testing/google-cloud-appengine-java8</module>
<module>testing/google-cloud-appengine-flex-compat</module>
</modules>
<pluginRepositories>
<pluginRepository>
Expand Down
63 changes: 63 additions & 0 deletions testing/google-cloud-appengine-flex-compat/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>google-cloud-pom</artifactId>
<groupId>com.google.cloud</groupId>
<version>0.11.2-alpha-SNAPSHOT</version>

This comment was marked as spam.

This comment was marked as spam.

<relativePath>../..</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<artifactId>google-cloud-appengine-flex-compat</artifactId>

<properties>
<appengine.sdk.version>1.9.51</appengine.sdk.version>
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>
<java.source.version>1.7</java.source.version>
</properties>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-managed-test</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>${appengine.sdk.version}</version>
</dependency>
</dependencies>

<build>
<outputDirectory>
${project.build.directory}/${project.build.finalName}/WEB-INF/classes
</outputDirectory>

<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.maven.plugin}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<version>3.3</version>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.source.version}</source>
<target>${java.source.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>${appengine.sdk.version}</version>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<application>vam-veneer</application>

This comment was marked as spam.

<service>flex-compat</service>
<version>1</version>
<threadsafe>true</threadsafe>
<!--<instance-class>B8</instance-class>-->

This comment was marked as spam.

This comment was marked as spam.

<env>flex</env>
<beta-settings>
<setting name="enable_app_engine_apis" value="true"/>
</beta-settings>
<manual-scaling>
<instances>1</instances>
</manual-scaling>
</appengine-web-app>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
</web-app>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<html>
<title>google-cloud-java managed environments tests executor</title>
<body>
<p>Enter fully qualified test class names to execute. One class per line, use '#' for comments.</p>
<form method="POST" action="/test">
<label>
<textarea name="classes" cols="50" rows="10">#com.google.cloud.storage.BlobIdTest</textarea>
</label>
<br/>
<input type="submit"/>
</form>
</body>
</html>
51 changes: 51 additions & 0 deletions testing/google-cloud-appengine-flex-custom/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>google-cloud-pom</artifactId>
<groupId>com.google.cloud</groupId>
<version>0.11.2-alpha-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<artifactId>google-cloud-appengine-flex-custom</artifactId>

<properties>
<appengine.maven.plugin>1.2.1</appengine.maven.plugin>
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>
</properties>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-managed-test</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<outputDirectory>
${project.build.directory}/${project.build.finalName}/WEB-INF/classes
</outputDirectory>

<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.maven.plugin}</version>
</plugin>

<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>${appengine.maven.plugin}</version>
<configuration>
<deploy.version>1</deploy.version>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
runtime: custom
env: flex

handlers:
- url: /.*
script: this field is required, but ignored

service: flex-custom

manual_scaling:
instances: 1

resources:
cpu: 1
memory_gb: 6
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FROM gcr.io/google_appengine/jetty
ADD google-cloud-appengine-flex-custom-0.10.1-alpha-SNAPSHOT.war $JETTY_BASE/webapps/root.war

This comment was marked as spam.

This comment was marked as spam.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
</web-app>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<html>
<title>google-cloud-java managed environments tests executor</title>
<body>
<p>Enter fully qualified test class names to execute. One class per line, use '#' for comments.</p>
<form method="POST" action="/test">
<label>
<textarea name="classes" cols="50" rows="10">#com.google.cloud.storage.BlobIdTest</textarea>
</label>
<br/>
<input type="submit"/>
</form>
</body>
</html>
51 changes: 51 additions & 0 deletions testing/google-cloud-appengine-flex-java/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>google-cloud-pom</artifactId>
<groupId>com.google.cloud</groupId>
<version>0.11.2-alpha-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<artifactId>google-cloud-appengine-flex-java</artifactId>

<properties>
<appengine.maven.plugin>1.2.1</appengine.maven.plugin>
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>
</properties>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-managed-test</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<outputDirectory>
${project.build.directory}/${project.build.finalName}/WEB-INF/classes
</outputDirectory>

<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.maven.plugin}</version>
</plugin>

<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>${appengine.maven.plugin}</version>
<configuration>
<deploy.version>1</deploy.version>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
runtime: java
env: flex

runtime_config: # Optional

This comment was marked as spam.

This comment was marked as spam.

jdk: openjdk8
server: jetty9

handlers:
- url: /.*
script: this field is required, but ignored

service: flex-java

manual_scaling:
instances: 1

resources:
cpu: 1
memory_gb: 6
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
</web-app>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<html>
<title>google-cloud-java managed environments tests executor</title>
<body>
<p>Enter fully qualified test class names to execute. One class per line, use '#' for comments.</p>
<form method="POST" action="/test">
<label>
<textarea name="classes" cols="50" rows="10">#com.google.cloud.storage.BlobIdTest</textarea>
</label>
<br/>
<input type="submit"/>
</form>
</body>
</html>
58 changes: 58 additions & 0 deletions testing/google-cloud-appengine-java8/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>google-cloud-pom</artifactId>
<groupId>com.google.cloud</groupId>
<version>0.11.2-alpha-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<artifactId>google-cloud-appengine-java8</artifactId>

<properties>
<appengine.sdk.version>1.9.51</appengine.sdk.version>
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>
<java.source.version>1.8</java.source.version>
</properties>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-managed-test</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<outputDirectory>
${project.build.directory}/${project.build.finalName}/WEB-INF/classes
</outputDirectory>

<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.maven.plugin}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<version>3.3</version>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.source.version}</source>
<target>${java.source.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>${appengine.sdk.version}</version>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<application>vam-veneer</application>

This comment was marked as spam.

This comment was marked as spam.

<service>std-java8</service>
<version>1</version>
<runtime>java8</runtime>
<threadsafe>true</threadsafe>
<instance-class>B8</instance-class>
<manual-scaling>
<instances>1</instances>
</manual-scaling>
</appengine-web-app>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
</web-app>
Loading