Port the remaining kotlin tests to docker (#3372)

.travis.yml

@@ -108,10 +108,10 @@ env:
      - "TESTDIR=Java/wicket"
      - "TESTDIR=Java/wildfly-ee7"
      - "TESTLANG=JavaScript"
-    # - "TESTDIR=Kotlin/hexagon"
-    # - "TESTDIR=Kotlin/http4k"
+     - "TESTDIR=Kotlin/hexagon"
+     - "TESTDIR=Kotlin/http4k"
      - "TESTDIR=Kotlin/ktor"
-    # - "TESTDIR=Kotlin/pronghorn"
+     - "TESTDIR=Kotlin/pronghorn"
      - "TESTDIR=Lua/lapis"
     # - "TESTDIR=Lua/octopus"
     # - "TESTDIR=Lua/openresty"

frameworks/Kotlin/hexagon/benchmark_config.json

@@ -22,10 +22,9 @@
                 "database_os": "Linux",
                 "display_name": "Hexagon Jetty MongoDB",
                 "notes": "http://hexagonkt.com",
-                "setup_file": "setup_jetty_mongodb",
                 "versus": "servlet"
             },
-            "undertow_mongodb": {
+            "undertow-mongodb": {
                 "json_url": "/json",
                 "db_url": "/db",
                 "query_url": "/query?queries=",
@@ -45,10 +44,9 @@
                 "database_os": "Linux",
                 "display_name": "Hexagon Undertow MongoDB",
                 "notes": "http://hexagonkt.com",
-                "setup_file": "setup_undertow_mongodb",
                 "versus": "servlet"
             },
-            "jetty_postgresql": {
+            "jetty-postgresql": {
                 "json_url": "/json",
                 "db_url": "/db",
                 "query_url": "/query?queries=",
@@ -68,10 +66,9 @@
                 "database_os": "Linux",
                 "display_name": "Hexagon Jetty PostgreSQL",
                 "notes": "http://hexagonkt.com",
-                "setup_file": "setup_jetty_postgresql",
                 "versus": "servlet"
             },
-            "undertow_postgresql": {
+            "undertow-postgresql": {
                 "json_url": "/json",
                 "db_url": "/db",
                 "query_url": "/query?queries=",
@@ -91,7 +88,6 @@
                 "database_os": "Linux",
                 "display_name": "Hexagon Undertow PostgreSQL",
                 "notes": "http://hexagonkt.com",
-                "setup_file": "setup_undertow_postgresql",
                 "versus": "servlet"
             }
         }

frameworks/Kotlin/hexagon/hexagon-jetty-postgresql.dockerfile

@@ -0,0 +1,7 @@
+FROM tfb/java:latest
+ADD ./ /hexagon
+WORKDIR /hexagon
+RUN ./gradlew -x test
+ENV DBSTORE postgresql
+ENV WEBENGINE jetty
+CMD build/install/hexagon/bin/hexagon

frameworks/Kotlin/hexagon/hexagon-undertow-mongodb.dockerfile

@@ -0,0 +1,7 @@
+FROM tfb/java:latest
+ADD ./ /hexagon
+WORKDIR /hexagon
+RUN ./gradlew -x test
+ENV DBSTORE mongodb
+ENV WEBENGINE undertow
+CMD build/install/hexagon/bin/hexagon

frameworks/Kotlin/hexagon/hexagon-undertow-postgresql.dockerfile

@@ -0,0 +1,7 @@
+FROM tfb/java:latest
+ADD ./ /hexagon
+WORKDIR /hexagon
+RUN ./gradlew -x test
+ENV DBSTORE postgresql
+ENV WEBENGINE undertow
+CMD build/install/hexagon/bin/hexagon

frameworks/Kotlin/hexagon/hexagon.dockerfile

@@ -0,0 +1,7 @@
+FROM tfb/java:latest
+ADD ./ /hexagon
+WORKDIR /hexagon
+RUN ./gradlew -x test
+ENV DBSTORE mongodb
+ENV WEBENGINE jetty
+CMD build/install/hexagon/bin/hexagon

frameworks/Kotlin/hexagon/setup_jetty_mongodb.sh

@@ -1,9 +0,0 @@
-
-#!/bin/bash
-
-fw_depends java mongodb
-
-./gradlew -x test
-export DBSTORE='mongodb'
-export WEBENGINE='jetty'
-nohup build/install/hexagon/bin/hexagon &

frameworks/Kotlin/hexagon/setup_jetty_postgresql.sh

@@ -1,9 +0,0 @@
-
-#!/bin/bash
-
-fw_depends java postgresql
-
-./gradlew -x test
-export DBSTORE='postgresql'
-export WEBENGINE='jetty'
-nohup build/install/hexagon/bin/hexagon &

frameworks/Kotlin/hexagon/setup_resin_mongodb.sh

@@ -1,13 +0,0 @@
-
-#!/bin/bash
-
-fw_depends java mongodb
-
-./gradlew -x test
-export DBSTORE='mongodb'
-export WEBENGINE='resin'
-
-rm -rf $RESIN_HOME/webapps/*
-cp build/libs/ROOT.war $RESIN_HOME/webapps
-resinctl console
-

frameworks/Kotlin/hexagon/setup_resin_postgresql.sh

@@ -1,13 +0,0 @@
-
-#!/bin/bash
-
-fw_depends java postgresql
-
-./gradlew -x test
-export DBSTORE='postgresql'
-export WEBENGINE='resin'
-
-rm -rf $RESIN_HOME/webapps/*
-cp build/libs/ROOT.war $RESIN_HOME/webapps
-resinctl console
-

frameworks/Kotlin/hexagon/setup_undertow_mongodb.sh

@@ -1,9 +0,0 @@
-
-#!/bin/bash
-
-fw_depends java mongodb
-
-./gradlew -x test
-export DBSTORE='mongodb'
-export WEBENGINE='undertow'
-nohup build/install/hexagon/bin/hexagon &

frameworks/Kotlin/hexagon/setup_undertow_postgresql.sh

@@ -1,9 +0,0 @@
-
-#!/bin/bash
-
-fw_depends java postgresql
-
-./gradlew -x test
-export DBSTORE='postgresql'
-export WEBENGINE='undertow'
-nohup build/install/hexagon/bin/hexagon &

frameworks/Kotlin/http4k/benchmark_config.json

@@ -3,7 +3,6 @@
   "tests": [
     {
       "default": {
-        "setup_file": "setup_jetty",
         "orm": "Raw",
         "database_os": "Linux",
         "db_url": "/db",
@@ -21,12 +20,10 @@
         "platform": "servlet",
         "webserver": "None",
         "os": "Linux",
-        "display_name": "http4k-jetty",
         "notes": "",
         "versus": "servlet"
       },
       "undertow": {
-        "setup_file": "setup_undertow",
         "orm": "Raw",
         "database_os": "Linux",
         "db_url": "/db",
@@ -44,12 +41,10 @@
         "platform": "undertow",
         "webserver": "None",
         "os": "Linux",
-        "display_name": "http4k-undertow",
         "notes": "",
         "versus": "undertow"
       },
       "netty": {
-        "setup_file": "setup_netty",
         "orm": "Raw",
         "database_os": "Linux",
         "db_url": "/db",
@@ -67,12 +62,10 @@
         "platform": "netty",
         "webserver": "None",
         "os": "Linux",
-        "display_name": "http4k-netty",
         "notes": "",
         "versus": "netty"
       },
-      "apache-httpcore": {
-        "setup_file": "setup_apache",
+      "apache": {
         "orm": "Raw",
         "database_os": "Linux",
         "db_url": "/db",
@@ -90,12 +83,10 @@
         "platform": "apache-httpcore",
         "webserver": "None",
         "os": "Linux",
-        "display_name": "http4k-apache-httpcore",
         "notes": "",
         "versus": "servlet"
       },
       "sunhttp": {
-        "setup_file": "setup_sunhttp",
         "orm": "Raw",
         "database_os": "Linux",
         "db_url": "/db",
@@ -113,7 +104,6 @@
         "platform": "sun-http",
         "webserver": "None",
         "os": "Linux",
-        "display_name": "http4k-sunhttp",
         "notes": "",
         "versus": "servlet"
       }

frameworks/Kotlin/http4k/http4k-apache.dockerfile

@@ -0,0 +1,11 @@
+FROM tfb/java:latest
+ADD ./ /http4k
+WORKDIR /http4k
+RUN ./gradlew clean build apache:uber
+CMD java \
+    -server \
+    -XX:+UseNUMA \
+    -XX:+UseParallelGC \
+    -XX:+AggressiveOpts \
+    -XX:+AlwaysPreTouch \
+    -jar apache/build/libs/http4k-apache-benchmark.jar

frameworks/Kotlin/http4k/http4k-netty.dockerfile

@@ -0,0 +1,11 @@
+FROM tfb/java:latest
+ADD ./ /http4k
+WORKDIR /http4k
+RUN ./gradlew clean build netty:uber
+CMD java \
+    -server \
+    -XX:+UseNUMA \
+    -XX:+UseParallelGC \
+    -XX:+AggressiveOpts \
+    -XX:+AlwaysPreTouch \
+    -jar netty/build/libs/http4k-netty-benchmark.jar

frameworks/Kotlin/http4k/http4k-sunhttp.dockerfile

@@ -0,0 +1,11 @@
+FROM tfb/java:latest
+ADD ./ /http4k
+WORKDIR /http4k
+RUN ./gradlew clean build sunhttp:uber
+CMD java \
+    -server \
+    -XX:+UseNUMA \
+    -XX:+UseParallelGC \
+    -XX:+AggressiveOpts \
+    -XX:+AlwaysPreTouch \
+    -jar sunhttp/build/libs/http4k-sunhttp-benchmark.jar

frameworks/Kotlin/http4k/http4k-undertow.dockerfile

@@ -0,0 +1,11 @@
+FROM tfb/java:latest
+ADD ./ /http4k
+WORKDIR /http4k
+RUN ./gradlew clean build undertow:uber
+CMD java \
+    -server \
+    -XX:+UseNUMA \
+    -XX:+UseParallelGC \
+    -XX:+AggressiveOpts \
+    -XX:+AlwaysPreTouch \
+    -jar undertow/build/libs/http4k-undertow-benchmark.jar

frameworks/Kotlin/http4k/http4k.dockerfile

@@ -0,0 +1,11 @@
+FROM tfb/java:latest
+ADD ./ /http4k
+WORKDIR /http4k
+RUN ./gradlew clean build jetty:uber
+CMD java \
+    -server \
+    -XX:+UseNUMA \
+    -XX:+UseParallelGC \
+    -XX:+AggressiveOpts \
+    -XX:+AlwaysPreTouch \
+    -jar jetty/build/libs/http4k-jetty-benchmark.jar

frameworks/Kotlin/http4k/setup_apache.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends postgresql java
-
-./gradlew clean build apache:uber
-
-java -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+AlwaysPreTouch -jar apache/build/libs/http4k-apache-benchmark.jar &

frameworks/Kotlin/http4k/setup_jetty.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends postgresql java
-
-./gradlew clean build jetty:uber
-
-java -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+AlwaysPreTouch -jar jetty/build/libs/http4k-jetty-benchmark.jar &

frameworks/Kotlin/http4k/setup_netty.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends postgresql java
-
-./gradlew clean build netty:uber
-
-java -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+AlwaysPreTouch -jar netty/build/libs/http4k-netty-benchmark.jar &

frameworks/Kotlin/http4k/setup_sunhttp.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends postgresql java
-
-./gradlew clean build sunhttp:uber
-
-java -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+AlwaysPreTouch -jar sunhttp/build/libs/http4k-sunhttp-benchmark.jar &

frameworks/Kotlin/http4k/setup_undertow.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends postgresql java
-
-./gradlew clean build undertow:uber
-
-java -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+AlwaysPreTouch -jar undertow/build/libs/http4k-undertow-benchmark.jar &

frameworks/Kotlin/pronghorn/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "pronghorn",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "db_url": "/db",

frameworks/Kotlin/pronghorn/pronghorn.dockerfile

@@ -0,0 +1,4 @@
+FROM tfb/java:latest
+ADD ./ /pronghorn
+WORKDIR /pronghorn
+CMD ./gradlew --no-daemon clean run

frameworks/Kotlin/pronghorn/setup.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-fw_depends java mongodb
-
-./gradlew --no-daemon clean run