move to env: flex, no need of appengine-web.xml see GoogleCloudPlatfo…

…rm#136 Signed-off-by: olivier lamy <olamy@apache.org>
olamy · Mar 2, 2017 · 468590d · 468590d
1 parent 96f6cce
commit 468590d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git a/perf/perf-runner/pom.xml b/perf/perf-runner/pom.xml
@@ -29,7 +29,7 @@
 		<runner.instances>2</runner.instances>
 		<debug.args></debug.args>
 		<resources.cpu>2</resources.cpu>
-		<resources.memory_gb>8</resources.memory_gb>
+		<resources.memory_gb>6</resources.memory_gb>
 		<httpClientSelectors>2</httpClientSelectors>
 	</properties>
 

diff --git a/perf/perf-runner/src/main/appengine/app.yaml b/perf/perf-runner/src/main/appengine/app.yaml
@@ -1,5 +1,5 @@
 runtime: custom
-vm: true
+env: flex
 service: jetty-runtime-perf-runner
 resources:
   cpu: ${resources.cpu}

diff --git a/perf/perf-server/src/main/appengine/app.yaml b/perf/perf-server/src/main/appengine/app.yaml
@@ -1,5 +1,5 @@
 runtime: custom
-vm: true
+env: flex
 service: jetty-runtime-perf-app
 resources:
   cpu: ${resources.cpu}

diff --git a/perf/perf-server/src/main/webapp/WEB-INF/appengine-web.xml b/perf/perf-server/src/main/webapp/WEB-INF/appengine-web.xml