revert CI debugging statements; revert .travis.yml; output DB setup text during installation

.travis.yml

@@ -24,131 +24,131 @@ env:
     #   find . -type d -depth 2 | sed 's|./|    - "TESTDIR=|' | sed 's/$/"/g'
     #
     #  
-    #- "TESTDIR=C/duda"
-    #- "TESTDIR=C/onion"
-    #- "TESTDIR=C#/aspnet"
+    - "TESTDIR=C/duda"
+    - "TESTDIR=C/onion"
+    - "TESTDIR=C#/aspnet"
     # - "TESTDIR=C#/aspnet-stripped"
-    #- "TESTDIR=C#/evhttp-sharp"
+    - "TESTDIR=C#/evhttp-sharp"
     # - "TESTDIR=C#/HttpListener"
-    #- "TESTDIR=C#/nancy"
-    #- "TESTDIR=C#/servicestack"
-    #- "TESTDIR=C++/cpoll_cppsp"
-    #- "TESTDIR=C++/treefrog"
-    #- "TESTDIR=C++/ULib"
-    #- "TESTDIR=C++/wt"
-    #- "TESTDIR=Clojure/compojure"
-    #- "TESTDIR=Clojure/http-kit"
-    #- "TESTDIR=Clojure/luminus"
-    #- "TESTDIR=Dart/dart"
-    #- "TESTDIR=Dart/dart-redstone"
-    #- "TESTDIR=Dart/dart-start"
-    #- "TESTDIR=Dart/dart-stream"
-    #- "TESTDIR=Elixir/WeberFramework"
-    #- "TESTDIR=Erlang/cowboy"
-    #- "TESTDIR=Erlang/elli"
-    #- "TESTDIR=Go/beego"
-    #- "TESTDIR=Go/falcore"
-    #- "TESTDIR=Go/gin"
-    #- "TESTDIR=Go/go"
-    #- "TESTDIR=Go/gorail"
-    #- "TESTDIR=Go/revel"
-    #- "TESTDIR=Go/revel-jet"
-    #- "TESTDIR=Go/revel-qbs"
-    #- "TESTDIR=Go/webgo"
-    #- "TESTDIR=Groovy/grails"
-    #- "TESTDIR=Haskell/snap"
-    #- "TESTDIR=Haskell/wai"
-    #- "TESTDIR=Haskell/yesod"
-    #- "TESTDIR=Java/activeweb"
-    #- "TESTDIR=Java/curacao"
-    #- "TESTDIR=Java/dropwizard"
-    #- "TESTDIR=Java/dropwizard-mongodb"
-    #- "TESTDIR=Java/gemini"
-    #- "TESTDIR=Java/grizzly-bm"
-    #- "TESTDIR=Java/grizzly-jersey"
+    - "TESTDIR=C#/nancy"
+    - "TESTDIR=C#/servicestack"
+    - "TESTDIR=C++/cpoll_cppsp"
+    - "TESTDIR=C++/treefrog"
+    - "TESTDIR=C++/ULib"
+    - "TESTDIR=C++/wt"
+    - "TESTDIR=Clojure/compojure"
+    - "TESTDIR=Clojure/http-kit"
+    - "TESTDIR=Clojure/luminus"
+    - "TESTDIR=Dart/dart"
+    - "TESTDIR=Dart/dart-redstone"
+    - "TESTDIR=Dart/dart-start"
+    - "TESTDIR=Dart/dart-stream"
+    - "TESTDIR=Elixir/WeberFramework"
+    - "TESTDIR=Erlang/cowboy"
+    - "TESTDIR=Erlang/elli"
+    - "TESTDIR=Go/beego"
+    - "TESTDIR=Go/falcore"
+    - "TESTDIR=Go/gin"
+    - "TESTDIR=Go/go"
+    - "TESTDIR=Go/gorail"
+    - "TESTDIR=Go/revel"
+    - "TESTDIR=Go/revel-jet"
+    - "TESTDIR=Go/revel-qbs"
+    - "TESTDIR=Go/webgo"
+    - "TESTDIR=Groovy/grails"
+    - "TESTDIR=Haskell/snap"
+    - "TESTDIR=Haskell/wai"
+    - "TESTDIR=Haskell/yesod"
+    - "TESTDIR=Java/activeweb"
+    - "TESTDIR=Java/curacao"
+    - "TESTDIR=Java/dropwizard"
+    - "TESTDIR=Java/dropwizard-mongodb"
+    - "TESTDIR=Java/gemini"
+    - "TESTDIR=Java/grizzly-bm"
+    - "TESTDIR=Java/grizzly-jersey"
     - "TESTDIR=Java/jetty-servlet"
-    #- "TESTDIR=Java/netty"
-    #- "TESTDIR=Java/ninja-standalone"
-    #- "TESTDIR=Java/play1"
-    #- "TESTDIR=Java/play1siena"
-    #- "TESTDIR=Java/play2-java"
-    #- "TESTDIR=Java/restexpress"
-    #- "TESTDIR=Java/servlet"
+    - "TESTDIR=Java/netty"
+    - "TESTDIR=Java/ninja-standalone"
+    - "TESTDIR=Java/play1"
+    - "TESTDIR=Java/play1siena"
+    - "TESTDIR=Java/play2-java"
+    - "TESTDIR=Java/restexpress"
+    - "TESTDIR=Java/servlet"
     - "TESTDIR=Java/servlet3-cass"
-    #- "TESTDIR=Java/spark"
-    #- "TESTDIR=Java/spring"
-    #- "TESTDIR=Java/tapestry"
-    #- "TESTDIR=Java/undertow"
-    #- "TESTDIR=Java/undertow-edge"
-    #- "TESTDIR=Java/vertx"
-    #- "TESTDIR=Java/wicket"
-    #- "TESTDIR=Java/wildfly-ee7"
-    #- "TESTDIR=JavaScript/express"
-    #- "TESTDIR=JavaScript/hapi"
-    #- "TESTDIR=JavaScript/nodejs"
-    #- "TESTDIR=JavaScript/ringojs"
-    #- "TESTDIR=JavaScript/ringojs-convenient"
-    #- "TESTDIR=Lua/lapis"
-    #- "TESTDIR=Lua/leda"
-    #- "TESTDIR=Lua/openresty"
-    #- "TESTDIR=Nimrod/jester"
-    #- "TESTDIR=Nimrod/nawak"
-    #- "TESTDIR=Perl/dancer"
-    #- "TESTDIR=Perl/kelp"
-    #- "TESTDIR=Perl/mojolicious"
-    #- "TESTDIR=Perl/plack"
-    #- "TESTDIR=Perl/web-simple"
-    #- "TESTDIR=PHP/cakephp"
-    #- "TESTDIR=PHP/hhvm"
-    #- "TESTDIR=PHP/php"
-    #- "TESTDIR=PHP/php-codeigniter"
-    #- "TESTDIR=PHP/php-fatfree"
-    #- "TESTDIR=PHP/php-fuel"
-    #- "TESTDIR=PHP/php-kohana"
-    #- "TESTDIR=PHP/php-laravel"
-    #- "TESTDIR=PHP/php-lithium"
-    #- "TESTDIR=PHP/php-micromvc"
-    #- "TESTDIR=PHP/php-phalcon"
-    #- "TESTDIR=PHP/php-phalcon-micro"
-    #- "TESTDIR=PHP/php-phpixie"
-    #- "TESTDIR=PHP/php-pimf"
-    #- "TESTDIR=PHP/php-senthot"
-    #- "TESTDIR=PHP/php-silex"
-    #- "TESTDIR=PHP/php-silex-orm"
-    #- "TESTDIR=PHP/php-silica"
-    #- "TESTDIR=PHP/php-slim"
-    #- "TESTDIR=PHP/php-symfony2"
-    #- "TESTDIR=PHP/php-symfony2-stripped"
-    #- "TESTDIR=PHP/php-yaf"
-    #- "TESTDIR=PHP/php-yii2"
-    #- "TESTDIR=PHP/php-zend-framework"
-    #- "TESTDIR=PHP/phreeze"
-    #- "TESTDIR=Python/bottle"
-    #- "TESTDIR=Python/django"
-    #- "TESTDIR=Python/falcon"
-    #- "TESTDIR=Python/flask"
-    #- "TESTDIR=Python/pyramid"
-    #- "TESTDIR=Python/tornado"
-    #- "TESTDIR=Python/uwsgi"
-    #- "TESTDIR=Python/wsgi"
-    #- "TESTDIR=Racket/racket-ws"
-    #- "TESTDIR=Ruby/grape"
-    #- "TESTDIR=Ruby/padrino"
-    #- "TESTDIR=Ruby/rack"
-    #- "TESTDIR=Ruby/rails"
-    #- "TESTDIR=Ruby/rails-stripped"
-    #- "TESTDIR=Ruby/sinatra"
-    #- "TESTDIR=Scala/finagle"
-    #- "TESTDIR=Scala/lift-stateless"
-    #- "TESTDIR=Scala/plain"
-    #- "TESTDIR=Scala/play-activate-mysql"
-    #- "TESTDIR=Scala/play-scala-mongodb"
-    #- "TESTDIR=Scala/play2-scala"
-    #- "TESTDIR=Scala/scalatra"
-    #- "TESTDIR=Scala/scruffy"
-    #- "TESTDIR=Scala/spray"
-    #- "TESTDIR=Scala/unfiltered"
-    #- "TESTDIR=Ur/urweb"
+    - "TESTDIR=Java/spark"
+    - "TESTDIR=Java/spring"
+    - "TESTDIR=Java/tapestry"
+    - "TESTDIR=Java/undertow"
+    - "TESTDIR=Java/undertow-edge"
+    - "TESTDIR=Java/vertx"
+    - "TESTDIR=Java/wicket"
+    - "TESTDIR=Java/wildfly-ee7"
+    - "TESTDIR=JavaScript/express"
+    - "TESTDIR=JavaScript/hapi"
+    - "TESTDIR=JavaScript/nodejs"
+    - "TESTDIR=JavaScript/ringojs"
+    - "TESTDIR=JavaScript/ringojs-convenient"
+    - "TESTDIR=Lua/lapis"
+    - "TESTDIR=Lua/leda"
+    - "TESTDIR=Lua/openresty"
+    - "TESTDIR=Nimrod/jester"
+    - "TESTDIR=Nimrod/nawak"
+    - "TESTDIR=Perl/dancer"
+    - "TESTDIR=Perl/kelp"
+    - "TESTDIR=Perl/mojolicious"
+    - "TESTDIR=Perl/plack"
+    - "TESTDIR=Perl/web-simple"
+    - "TESTDIR=PHP/cakephp"
+    - "TESTDIR=PHP/hhvm"
+    - "TESTDIR=PHP/php"
+    - "TESTDIR=PHP/php-codeigniter"
+    - "TESTDIR=PHP/php-fatfree"
+    - "TESTDIR=PHP/php-fuel"
+    - "TESTDIR=PHP/php-kohana"
+    - "TESTDIR=PHP/php-laravel"
+    - "TESTDIR=PHP/php-lithium"
+    - "TESTDIR=PHP/php-micromvc"
+    - "TESTDIR=PHP/php-phalcon"
+    - "TESTDIR=PHP/php-phalcon-micro"
+    - "TESTDIR=PHP/php-phpixie"
+    - "TESTDIR=PHP/php-pimf"
+    - "TESTDIR=PHP/php-senthot"
+    - "TESTDIR=PHP/php-silex"
+    - "TESTDIR=PHP/php-silex-orm"
+    - "TESTDIR=PHP/php-silica"
+    - "TESTDIR=PHP/php-slim"
+    - "TESTDIR=PHP/php-symfony2"
+    - "TESTDIR=PHP/php-symfony2-stripped"
+    - "TESTDIR=PHP/php-yaf"
+    - "TESTDIR=PHP/php-yii2"
+    - "TESTDIR=PHP/php-zend-framework"
+    - "TESTDIR=PHP/phreeze"
+    - "TESTDIR=Python/bottle"
+    - "TESTDIR=Python/django"
+    - "TESTDIR=Python/falcon"
+    - "TESTDIR=Python/flask"
+    - "TESTDIR=Python/pyramid"
+    - "TESTDIR=Python/tornado"
+    - "TESTDIR=Python/uwsgi"
+    - "TESTDIR=Python/wsgi"
+    - "TESTDIR=Racket/racket-ws"
+    - "TESTDIR=Ruby/grape"
+    - "TESTDIR=Ruby/padrino"
+    - "TESTDIR=Ruby/rack"
+    - "TESTDIR=Ruby/rails"
+    - "TESTDIR=Ruby/rails-stripped"
+    - "TESTDIR=Ruby/sinatra"
+    - "TESTDIR=Scala/finagle"
+    - "TESTDIR=Scala/lift-stateless"
+    - "TESTDIR=Scala/plain"
+    - "TESTDIR=Scala/play-activate-mysql"
+    - "TESTDIR=Scala/play-scala-mongodb"
+    - "TESTDIR=Scala/play2-scala"
+    - "TESTDIR=Scala/scalatra"
+    - "TESTDIR=Scala/scruffy"
+    - "TESTDIR=Scala/spray"
+    - "TESTDIR=Scala/unfiltered"
+    - "TESTDIR=Ur/urweb"
 
 before_install:
   # Need to install python modules before using 

frameworks/Java/servlet3-cass/setup.py

@@ -21,9 +21,6 @@ def start(args, logfile, errfile):
     subprocess.call("echo servlet3-cass application.properties", shell=True, stderr=errfile, stdout=logfile)
     subprocess.check_call("cat src/main/resources/application.properties", shell=True, cwd="servlet3-cass", stderr=errfile, stdout=logfile)
     subprocess.call("echo checking connection to TFB DB host: "+args.database_host, shell=True, stderr=errfile, stdout=logfile)
-    # next two are for debugging
-    subprocess.call("uname -a", shell=True, stderr=errfile, stdout=logfile)
-    subprocess.call("ps -ef", shell=True, stderr=errfile, stdout=logfile)
     subprocess.call("for i in 1 2 3 4 5; do nc -vz "+args.database_host+" 9160  && echo 'C* ok' && break || echo 'waiting for C*'; sleep 2; if [ $i -eq '5' ]; then echo 'ERROR: failed to connect to Cassandra'; fi; done", shell=True, stderr=errfile, stdout=logfile)
     subprocess.check_call("$RESIN_HOME/bin/resinctl start", shell=True, stderr=errfile, stdout=logfile)
     return 0

toolset/run-ci.py

@@ -339,21 +339,25 @@ class CIRunnner:
     # =======================================================
 
     # Add data to mysql
+    echo "Populating MySQL DB data"
     mysql -uroot < config/create.sql
 
     # Setup Postgres
+    echo "Setting up Postgres database"
     psql --version
     sudo useradd benchmarkdbuser -p benchmarkdbpass
     sudo -u postgres psql template1 < config/create-postgres-database.sql
     sudo -u benchmarkdbuser psql hello_world < config/create-postgres.sql
 
     # Setup Apache Cassandra
+    echo "Setting up Apache Cassandra database"
     until nc -z localhost 9160 ; do echo Waiting for Cassandra; sleep 1; done
     cat config/cassandra/cleanup-keyspace.cql | sudo cqlsh
     python config/cassandra/db-data-gen.py > config/cassandra/tfb-data.cql
     sudo cqlsh -f config/cassandra/create-keyspace.cql
     sudo cqlsh -f config/cassandra/tfb-data.cql
 
+    echo "Setting up MongDB database"
     # Setup MongoDB (see install above)
     mongod --version
     until nc -z localhost 27017 ; do echo Waiting for MongoDB; sleep 1; done

toolset/setup/linux/installer.py

@@ -148,6 +148,7 @@ class Installer:
     ##############################
     # MySQL
     ##############################
+    echo "Setting up MySQL database"
     sudo sh -c "echo mysql-server mysql-server/root_password_again select secret | debconf-set-selections"
     sudo sh -c "echo mysql-server mysql-server/root_password select secret | debconf-set-selections"
 
@@ -175,6 +176,7 @@ class Installer:
     ##############################
     # Postgres
     ##############################
+    echo "Setting up Postgres database"
     sudo -u postgres psql template1 < create-postgres-database.sql
     sudo -u benchmarkdbuser psql hello_world < create-postgres.sql
     rm create-postgres-database.sql create-postgres.sql
@@ -192,6 +194,7 @@ class Installer:
     ##############################
     # MongoDB
     ##############################
+    echo "Setting up MongoDB database"
     sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
     echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list
     sudo apt-get -y update
@@ -213,6 +216,7 @@ class Installer:
     ##############################
     # Apache Cassandra
     ##############################
+    echo "Setting up Apache Cassandra database"
     sudo apt-get install -qqy openjdk-7-jdk
     export CASS_V=2.0.7
     wget -nv http://archive.apache.org/dist/cassandra/$CASS_V/apache-cassandra-$CASS_V-bin.tar.gz
@@ -236,14 +240,10 @@ class Installer:
     apache-cassandra-$CASS_V/bin/cqlsh -f cassandra/tfb-data.cql {database_host}
     rm -rf apache-cassandra-*-bin.tar.gz cassandra
 
-    # next lines are for debugging
-    uname -a
-    ps -ef
-    ifconfig
-
     ##############################
     # Redis
     ##############################
+    echo "Setting up Redis database"
     sudo service redis-server stop
     # NOTE: This will cause errors on Ubuntu 12.04, as apt installs 
     # an older version of redis