Forráskód Böngészése

Java - combine similar builds for travis & tag broken tests (#5313)

Nate 5 éve
szülő
commit
d1e914b36b

+ 8 - 52
.travis.yml

@@ -42,58 +42,14 @@ env:
     - "TESTDIR=Haskell/servant"
     - "TESTDIR=Haskell/spock"
     - "TESTDIR=Haskell/warp"
-    - "TESTDIR=Java/act"
-    - "TESTDIR=Java/activeweb"
-    - "TESTDIR=Java/armeria"
-    - "TESTDIR=Java/baratine"
-    - "TESTDIR=Java/bayou"
-    - "TESTDIR=Java/blade"
-    - "TESTDIR=Java/comsat"
-    - "TESTDIR=Java/curacao"
-    - "TESTDIR=Java/dropwizard"
-    - "TESTDIR=Java/firenio"
-    - "TESTDIR=Java/gemini"
-    - "TESTDIR=Java/greenlightning"
-    - "TESTDIR=Java/grizzly"
-    - "TESTDIR=Java/helidon"
-    - "TESTDIR=Java/httpserver"
-    - "TESTDIR=Java/jawn"
-    - "TESTDIR=Java/javalin"
-    - "TESTDIR=Java/jetty"
-    - "TESTDIR=Java/jlhttp"
-    - "TESTDIR=Java/jooby"
-    - "TESTDIR=Java/light-java"
-    - "TESTDIR=Java/micronaut"
-    - "TESTDIR=Java/minijax"
-    - "TESTDIR=Java/nanohttpd"
-    - "TESTDIR=Java/netty"
-    - "TESTDIR=Java/ninja-standalone"
-    - "TESTDIR=Java/officefloor"
-    - "TESTDIR=Java/play1"
-    - "TESTDIR=Java/play2-java"
-    - "TESTDIR=Java/proteus"
-    - "TESTDIR=Java/quarkus"
-    - "TESTDIR=Java/rapidoid"
-    - "TESTDIR=Java/ratpack"
-    - "TESTDIR=Java/redkale"
-    - "TESTDIR=Java/restexpress"
-    - "TESTDIR=Java/revenj-jvm"
-    - "TESTDIR=Java/servlet"
-    - "TESTDIR=Java/servlet3"
-    - "TESTDIR=Java/smart-socket"
-    - "TESTDIR=Java/spark"
-    - "TESTDIR=Java/spring"
-    - "TESTDIR=Java/spring-webflux"
-    - "TESTDIR=Java/tapestry"
-    - "TESTDIR=Java/t-io"
-    - "TESTDIR=Java/undertow"
-    - "TESTDIR=Java/undertow-jersey"
-    - "TESTDIR=Java/vertx"
-    - "TESTDIR=Java/voovan"
-    - "TESTDIR=Java/vertx-web"
-    - "TESTDIR=Java/wicket"
-    - "TESTDIR=Java/wildfly-ee"
-    - "TESTDIR=Java/wizzardo-http"
+    - 'TESTDIR="Java/act Java/comsat"'
+    - 'TESTDIR="Java/activeweb Java/armeria Java/baratine Java/bayou Java/blade Java/curacao Java/dropwizard Java/firenio Java/voovan"'
+    - 'TESTDIR="Java/gemini Java/greenlightning Java/grizzly Java/helidon Java/httpserver Java/jetty Java/jhttp Java/jooby2 Java/wicket"'
+    - 'TESTDIR="Java/light-java Java/minijax Java/nanohttpd Java/netty Java/ninja-standalone Java/officefloor Java/proteus Java/quarkus"'
+    - 'TESTDIR="Java/rapidoid Java/redkale Java/restexpress Java/revenj-jvm Java/servlet Java/servlet3 Java/smart-socket Java/spark"'
+    - 'TESTDIR="Java/spring Java/spring-webflux Java/t-io Java/tapestry Java/undertow Java/undertow-jersey Java/vertx Java/vertx-web"'
+    - 'TESTDIR="Java/javalin Java/jawn Java/ratpack Java/wizzardo-http"'
+    - 'TESTDIR="Java/play1 Java/play2-java Java/wildfly-ee"'
     - 'TESTDIR="JavaScript/0http JavaScript/express JavaScript/fastify JavaScript/hapi JavaScript/koa"'
     - 'TESTDIR="JavaScript/nodejs JavaScript/polkadot JavaScript/restana JavaScript/restify JavaScript/sailsjs"'
     - 'TESTDIR="JavaScript/es4x JavaScript/ringojs"'

+ 4 - 3
frameworks/Java/dropwizard/benchmark_config.json

@@ -7,7 +7,6 @@
       "db_url": "/db",
       "query_url": "/db/query?queries=",
       "fortune_url": "/fortunes",
-      "update_url": "/db/update?queries=",
       "port": 9090,
       "approach": "Realistic",
       "classification": "Fullstack",
@@ -64,7 +63,8 @@
       "database_os": "Linux",
       "display_name": "dropwizard",
       "notes": "dropwizard PostgreSQL using hibernate",
-      "versus": "servlet-postgres-raw"
+      "versus": "servlet-postgres-raw",
+      "tags": ["broken"]
     },
     "jdbi-postgres": {
       "db_url": "/db",
@@ -84,7 +84,8 @@
       "database_os": "Linux",
       "display_name": "dropwizard",
       "notes": "dropwizard PostgreSQL using jdbi",
-      "versus": "servlet-postgres-raw"
+      "versus": "servlet-postgres-raw",
+      "tags": ["broken"]
     }
   }]
 }

+ 0 - 6
frameworks/Java/officefloor/benchmark_config.json

@@ -6,9 +6,7 @@
 				"json_url": "/json",
 				"plaintext_url": "/plaintext",
 				"db_url": "/db",
-				"query_url": "/queries?queries=",
 				"fortune_url": "/fortunes",
-				"update_url": "/update?queries=",
 				"port": 8080,
 				"approach": "Realistic",
 				"classification": "Fullstack",
@@ -113,9 +111,7 @@
 				"json_url": "/json",
 				"plaintext_url": "/plaintext",
 				"db_url": "/db",
-				"query_url": "/queries?queries=",
 				"fortune_url": "/fortunes",
-				"update_url": "/update?queries=",
 				"port": 8080,
 				"approach": "Realistic",
 				"classification": "Fullstack",
@@ -136,9 +132,7 @@
 				"json_url": "/json",
 				"plaintext_url": "/plaintext",
 				"db_url": "/db",
-				"query_url": "/queries?queries=",
 				"fortune_url": "/fortunes",
-				"update_url": "/update?queries=",
 				"port": 8080,
 				"approach": "Realistic",
 				"classification": "Fullstack",

+ 0 - 1
frameworks/Java/quarkus/benchmark_config.json

@@ -7,7 +7,6 @@
         "plaintext_url": "/plaintext",
         "db_url": "/db",
         "query_url": "/queries?queries=",
-        "update_url": "/updates?queries=",
         "fortune_url": "/fortunes",
         "port": 8080,
         "approach": "Realistic",

+ 2 - 2
frameworks/Java/spring-webflux/benchmark_config.json

@@ -20,13 +20,13 @@
       "database_os": "Linux",
       "display_name": "spring-webflux-r2dbc",
       "notes": "",
-      "versus": "spring"
+      "versus": "spring",
+      "tags": ["broken"]
     },
     "mongo": {
       "db_url": "/db",
       "query_url": "/queries?queries=",
       "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",