Port groovy tests to docker (#3374)

.travis.yml

@@ -63,8 +63,8 @@ env:
     # - "TESTDIR=Go/go-std"
     # - "TESTDIR=Go/revel"
     # - "TESTDIR=Go/webgo"
-    # - "TESTDIR=Groovy/grails"
-    # - "TESTDIR=Groovy/hot"
+     - "TESTDIR=Groovy/grails"
+     - "TESTDIR=Groovy/hot"
      - "TESTDIR=Haskell/snap"
      - "TESTDIR=Haskell/wai"
      # Separating these tests b/c of travis timeout

frameworks/Groovy/grails/README.md

@@ -1,33 +0,0 @@
-# Grails Benchmarking Test
-
-This is the Grails portion of a [benchmarking test suite](../) comparing a variety of web development platforms.
-
-## Infrastructure Software Versions
-The tests were run with:
-* [Grails 2.4.4](http://grails.org/)
-
-## Test URLs
-
-### Test type 1: JSON serialization
-
-http://localhost:8080/grails/hello/json
-
-### Test type 2: Single database query
-
-http://localhost:8080/grails/hello/db
-
-### Test type 3: Multiple database queries
-
-http://localhost:8080/grails/hello/queries?queries=10
-
-### Test type 4: Fortunes
-
-http://localhost:8080/grails/hello/fortunes
-
-### Test type 5: Database updates
-
-http://localhost:8080/grails/hello/updates?queries=10
-
-### Test type 6: Plaintext
-
-http://localhost:8080/grails/hello/plaintext

frameworks/Groovy/grails/benchmark_config.json

@@ -2,13 +2,12 @@
   "framework": "grails",
   "tests": [{
     "default": {
-      "setup_file": "setup",
-      "json_url": "/grails/hello/json",
-      "db_url": "/grails/hello/db",
-      "query_url": "/grails/hello/queries?queries=",
-      "fortune_url": "/grails/hello/fortunes",
-      "update_url": "/grails/hello/updates?queries=",
-      "plaintext_url": "/grails/hello/plaintext",
+      "json_url": "/hello/json",
+      "db_url": "/hello/db",
+      "query_url": "/hello/queries?queries=",
+      "fortune_url": "/hello/fortunes",
+      "update_url": "/hello/updates?queries=",
+      "plaintext_url": "/hello/plaintext",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",

frameworks/Groovy/grails/grails.dockerfile

@@ -0,0 +1,20 @@
+FROM tfb/resin-java8:latest
+
+ADD ./ /grails
+WORKDIR /grails
+
+ENV GRAILS_VERSION=2.4.4
+ENV GRAILS_HOME=/grails/grails-${GRAILS_VERSION}
+ENV GRAILS_WORK_DIR=${GRAILS_HOME}/.grails
+ENV GRAILS_AGENT_CACHE_DIR=${GRAILS_WORK_DIR}/.slcache
+
+RUN curl -sL -O http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-${GRAILS_VERSION}.zip
+RUN unzip -q grails-${GRAILS_VERSION}.zip
+ENV PATH="${GRAILS_HOME}/bin:${PATH}"
+
+RUN grails -Dgrails.work.dir=${GRAILS_WORK_DIR} -non-interactive -plain-output refresh-dependencies
+RUN grails -Dgrails.work.dir=${GRAILS_WORK_DIR} -non-interactive -plain-output compile
+RUN grails -Dgrails.work.dir=${GRAILS_WORK_DIR} prod -non-interactive -plain-output war
+
+RUN cp target/hello-0.1.war /var/resin/webapps/ROOT.war
+CMD resinctl console

frameworks/Groovy/grails/hello/.gitignore

@@ -1,19 +0,0 @@
-*.iws
-*Db.properties
-*Db.script
-.settings
-stacktrace.log
-/*.zip
-/plugin.xml
-/*.log
-/*DB.*
-/cobertura.ser
-.DS_Store
-/target/
-/out/
-/web-app/plugins
-/web-app/WEB-INF/classes
-/.link_to_grails_plugins/
-/target-eclipse/
-.project
-.classpath

frameworks/Groovy/grails/hello/.settings/org.codehaus.groovy.eclipse.preferences.prefs

@@ -1,3 +0,0 @@
-#Created by grails
-eclipse.preferences.version=1
-groovy.dont.generate.class.files=true

frameworks/Groovy/grails/setup.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql java8 grails resin-java8
-
-cd hello
-grails -Dgrails.work.dir=${IROOT}/.grails -non-interactive -plain-output refresh-dependencies
-grails -Dgrails.work.dir=${IROOT}/.grails -non-interactive -plain-output compile
-grails -Dgrails.work.dir=${IROOT}/.grails prod -non-interactive -plain-output war
-rm -rf $RESIN_HOME/webapps/*
-cp target/hello-0.1.war $RESIN_HOME/webapps/grails.war
-resinctl console

frameworks/Groovy/grails/source_code

@@ -1,75 +0,0 @@
-./grails/hello/grails-app/
-./grails/hello/grails-app/conf
-./grails/hello/grails-app/conf/UrlMappings.groovy
-./grails/hello/grails-app/conf/DataSource.groovy
-./grails/hello/grails-app/conf/ApplicationResources.groovy
-./grails/hello/grails-app/conf/BuildConfig.groovy
-./grails/hello/grails-app/conf/spring
-./grails/hello/grails-app/conf/spring/resources.groovy
-./grails/hello/grails-app/conf/Config.groovy
-./grails/hello/grails-app/conf/BootStrap.groovy
-./grails/hello/grails-app/controllers
-./grails/hello/grails-app/controllers/hello
-./grails/hello/grails-app/controllers/hello/HelloController.groovy
-./grails/hello/grails-app/i18n
-./grails/hello/grails-app/i18n/messages_es.properties
-./grails/hello/grails-app/i18n/messages_it.properties
-./grails/hello/grails-app/i18n/messages_th.properties
-./grails/hello/grails-app/i18n/messages_da.properties
-./grails/hello/grails-app/i18n/messages_cs_CZ.properties
-./grails/hello/grails-app/i18n/messages_sv.properties
-./grails/hello/grails-app/i18n/messages_fr.properties
-./grails/hello/grails-app/i18n/messages_ru.properties
-./grails/hello/grails-app/i18n/messages_de.properties
-./grails/hello/grails-app/i18n/messages_nl.properties
-./grails/hello/grails-app/i18n/messages_pt_PT.properties
-./grails/hello/grails-app/i18n/messages_zh_CN.properties
-./grails/hello/grails-app/i18n/messages.properties
-./grails/hello/grails-app/i18n/messages_ja.properties
-./grails/hello/grails-app/i18n/messages_pt_BR.properties
-./grails/hello/grails-app/views
-./grails/hello/grails-app/views/layouts
-./grails/hello/grails-app/views/layouts/main.gsp
-./grails/hello/grails-app/views/index.gsp
-./grails/hello/grails-app/views/error.gsp
-./grails/hello/grails-app/domain
-./grails/hello/grails-app/domain/hello
-./grails/hello/grails-app/domain/hello/World.groovy
-./grails/hello/web-app/
-./grails/hello/web-app/images
-./grails/hello/web-app/images/leftnav_top.png
-./grails/hello/web-app/images/grails_logo.png
-./grails/hello/web-app/images/apple-touch-icon.png
-./grails/hello/web-app/images/apple-touch-icon-retina.png
-./grails/hello/web-app/images/skin
-./grails/hello/web-app/images/skin/database_delete.png
-./grails/hello/web-app/images/skin/sorted_desc.gif
-./grails/hello/web-app/images/skin/information.png
-./grails/hello/web-app/images/skin/database_edit.png
-./grails/hello/web-app/images/skin/exclamation.png
-./grails/hello/web-app/images/skin/database_table.png
-./grails/hello/web-app/images/skin/shadow.jpg
-./grails/hello/web-app/images/skin/house.png
-./grails/hello/web-app/images/skin/sorted_asc.gif
-./grails/hello/web-app/images/skin/database_save.png
-./grails/hello/web-app/images/skin/database_add.png
-./grails/hello/web-app/images/grails_logo.jpg
-./grails/hello/web-app/images/spinner.gif
-./grails/hello/web-app/images/springsource.png
-./grails/hello/web-app/images/leftnav_midstretch.png
-./grails/hello/web-app/images/leftnav_btm.png
-./grails/hello/web-app/images/favicon.ico
-./grails/hello/web-app/js
-./grails/hello/web-app/js/application.js
-./grails/hello/web-app/css
-./grails/hello/web-app/css/mobile.css
-./grails/hello/web-app/css/main.css
-./grails/hello/web-app/css/errors.css
-./grails/hello/web-app/WEB-INF
-./grails/hello/web-app/WEB-INF/applicationContext.xml
-./grails/hello/web-app/WEB-INF/tld
-./grails/hello/web-app/WEB-INF/tld/spring.tld
-./grails/hello/web-app/WEB-INF/tld/fmt.tld
-./grails/hello/web-app/WEB-INF/tld/grails.tld
-./grails/hello/web-app/WEB-INF/tld/c.tld
-./grails/hello/web-app/WEB-INF/sitemesh.xml

frameworks/Groovy/hot/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "hot",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "json_url": "/rest/json",
       "plaintext_url": "/rest/plaintext",
       "port": 8080,
@@ -21,7 +20,6 @@
       "versus": ""
     },
     "mongodb" : {
-      "setup_file": "setup_mongodb",
       "db_url": "/rest/db/mongodb",
       "query_url": "/rest/queries/mongodb?queries=",
       "fortune_url": "/rest/fortunes/mongodb",

frameworks/Groovy/hot/config.json

@@ -5,7 +5,7 @@
   "dataSources" : [ {
     "name" : "mongo",
     "engine" : "MONGODB",
-    "hostname" : "localhost",
+    "hostname" : "TFB-database",
     "port" : 27017,
     "database" : "hello_world",
     "username" : "",

frameworks/Groovy/hot/hot-base.dockerfile

@@ -0,0 +1,7 @@
+FROM tfb/java8:latest
+ADD ./ /hot
+WORKDIR /hot
+ENV HOT_VERSION=0.9.2-SNAPSHOT
+RUN curl -sL https://github.com/dsolimando/Hot/releases/download/${HOT_VERSION}/hot-${HOT_VERSION}.tar.gz | tar xz
+ENV HOT_HOME=/hot/hot-${HOT_VERSION}
+ENV PATH="${HOT_HOME}:${PATH}"

frameworks/Groovy/hot/hot-mongodb.dockerfile

@@ -0,0 +1,2 @@
+FROM tfb/hot-base:latest
+CMD hot run

frameworks/Groovy/hot/hot.dockerfile

@@ -0,0 +1,2 @@
+FROM tfb/hot-base:latest
+CMD hot run

frameworks/Groovy/hot/setup.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-sed -i 's|localhost|'"${DBHOST}"'|g' config.json
-
-fw_depends java8 hot
-
-${HOT_HOME}/hot run

frameworks/Groovy/hot/setup_mongodb.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-fw_depends mongodb
-
-source ./setup.sh