Browse Source

Rbx removal (#2447)

* Remove rbx implementations

* put travis back

* remove the travis.bak
Nate 8 years ago
parent
commit
9cbd9ebebf

+ 1 - 23
frameworks/Ruby/grape/benchmark_config.json

@@ -22,29 +22,7 @@
       "display_name": "grape-puma-mri",
       "notes": "",
       "versus": "rack-puma-mri"
-    }, 
-    "puma-rbx": {
-      "setup_file": "run_rbx_puma",
-      "json_url": "/json",
-      "db_url": "/db", 
-      "query_url": "/query?queries=", 
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "grape",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "Rubinius",
-      "webserver": "Puma",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "grape-puma-rbx",
-      "notes": "",
-      "versus": "rack-puma-rbx"
-    }, 
+    },
     "thin": {
       "setup_file": "run_thin",
       "json_url": "/json",

+ 0 - 9
frameworks/Ruby/grape/run_rbx_puma.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql rvm rbx-2.5
-
-sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
-
-rvm rbx-$RBX_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
-
-rvm rbx-$RBX_VERSION do bundle exec puma -b tcp://0.0.0.0:8080 -e production &

+ 0 - 21
frameworks/Ruby/rack/benchmark_config.json

@@ -22,27 +22,6 @@
       "display_name": "rack-puma-mri",
       "notes": ""
     },
-    "puma-rbx": {
-      "setup_file": "run_rbx_puma",
-      "json_url": "/json",
-      "db_url": "/db", 
-      "query_url": "/queries?queries=", 
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Stripped",
-      "classification": "Platform",
-      "database": "MySQL",
-      "framework": "rack",
-      "language": "Ruby",
-      "orm": "Raw",
-      "platform": "Rubinius",
-      "webserver": "Puma",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "rack-puma-rbx",
-      "notes": ""
-    },
     "thin": {
       "setup_file": "run_thin",
       "json_url": "/json",

+ 0 - 9
frameworks/Ruby/rack/run_rbx_puma.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql rvm rbx-2.5
-
-sed -i 's|127.0.0.1|'${DBHOST}'|g' config/database.yml
-
-rvm rbx-$RBX_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
-
-rvm rbx-$RBX_VERSION do bundle exec puma -b tcp://0.0.0.0:8080 -e production &

+ 0 - 23
frameworks/Ruby/rails/benchmark_config.json

@@ -24,29 +24,6 @@
       "notes": "",
       "versus": "rack-puma-mri"
     },
-    "puma-rbx": {
-      "setup_file": "run_rbx_puma",
-      "json_url": "/hello_world/json",
-      "db_url": "/hello_world/db",
-      "query_url": "/hello_world/query?queries=",
-      "fortune_url": "/fortune",
-      "update_url": "/update?queries=",
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "MySQL",
-      "framework": "rails",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "Rubinius",
-      "webserver": "Puma",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "rails-puma-rbx",
-      "notes": "",
-      "versus": "rack-puma-rbx"
-    },
     "thin": {
       "setup_file": "run_thin",
       "json_url": "/hello_world/json",

+ 0 - 7
frameworks/Ruby/rails/run_rbx_puma.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql rvm rbx-2.5
-
-rvm rbx-$RBX_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
-
-DB_HOST=${DBHOST} rvm rbx-$RBX_VERSION do bundle exec puma -b tcp://0.0.0.0:8080 -e production &

+ 0 - 23
frameworks/Ruby/sinatra-sequel/benchmark_config.json

@@ -23,29 +23,6 @@
       "display_name": "sinatra-sequel-puma-mri",
       "notes": "",
       "versus": "rack-puma-mri"
-    },
-    "puma-rbx": {
-      "setup_file": "run_rbx_puma",
-      "json_url": "/json",
-      "db_url": "/db",
-      "query_url": "/queries?queries=",
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=",
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "sinatra-sequel",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "Rubinius",
-      "webserver": "Puma",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "sinatra-sequel-puma-rbx",
-      "notes": "",
-      "versus": "rack-puma-rbx"
     }
   }]
 }

+ 0 - 12
frameworks/Ruby/sinatra-sequel/run_rbx_puma.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql rvm rbx-2.5
-
-rvm rbx-$RBX_VERSION do \
-  bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
-
-MAX_THREADS=256 ; export MAX_THREADS
-MIN_THREADS=$(( MAX_THREADS / 8 * 2 ))
-
-rvm rbx-$RBX_VERSION do \
-  bundle exec puma -t $MIN_THREADS:$MAX_THREADS -b tcp://0.0.0.0:8080 -e production &

+ 0 - 23
frameworks/Ruby/sinatra/benchmark_config.json

@@ -24,29 +24,6 @@
       "notes": "",
       "versus": "rack-puma-mri"
     },
-    "puma-rbx": {
-      "setup_file": "run_rbx_puma",
-      "json_url": "/json",
-      "db_url": "/db",
-      "query_url": "/queries?queries=",
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "sinatra",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "Rubinius",
-      "webserver": "Puma",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "sinatra-puma-rbx",
-      "notes": "",
-      "versus": "rack-puma-rbx"
-    },
     "thin": {
       "setup_file": "run_thin",
       "json_url": "/json",

+ 0 - 7
frameworks/Ruby/sinatra/run_rbx_puma.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql rvm rbx-2.5
-
-rvm rbx-$RBX_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
-
-WEB_SERVER=Puma DB_HOST=${DBHOST} rvm rbx-$RBX_VERSION do bundle exec puma &

+ 0 - 26
toolset/setup/linux/languages/ruby/rbx-2.4.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-fw_depends rvm
-
-RETCODE=$(fw_exists ${IROOT}/rbx-2.4.installed)
-[ ! "$RETCODE" == 0 ] || { \
-  # Load environment variables
-  source $IROOT/rbx-2.4.installed
-  return 0; }
-
-# rvm stable [typically] only provides one version of rbx-2.4
-# update this when it changes
-RBX_VERSION=2.4.1
-
-# This version of RBX needs clang 3.4
-sudo apt-get -yq --force-yes install clang-3.4
-
-SHELL="/bin/bash" rvm install rbx-$RBX_VERSION
-# Bundler is SOMETIMES missing... not sure why.
-SHELL="/bin/bash" rvm rbx-$RBX_VERSION do gem install bundler
-
-echo "export LC_ALL=en_US.UTF-8" > $IROOT/rbx-2.4.installed
-echo "export LANG=en_US.UTF-8" >> $IROOT/rbx-2.4.installed
-echo "export RBX_VERSION=${RBX_VERSION}" >> $IROOT/rbx-2.4.installed
-
-source $IROOT/rbx-2.4.installed

+ 0 - 26
toolset/setup/linux/languages/ruby/rbx-2.5.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-fw_depends rvm
-
-RETCODE=$(fw_exists ${IROOT}/rbx-2.5.installed)
-[ ! "$RETCODE" == 0 ] || { \
-  # Load environment variables
-  source $IROOT/rbx-2.5.installed
-  return 0; }
-
-# rvm stable [typically] only provides one version of rbx-2.5
-# update this when it changes
-RBX_VERSION=2.5.2
-
-# This version of RBX needs clang 3.4
-sudo apt-get -yq --force-yes install clang-3.4
-
-SHELL="/bin/bash" rvm install rbx-$RBX_VERSION
-# Bundler is SOMETIMES missing... not sure why.
-SHELL="/bin/bash" rvm rbx-$RBX_VERSION do gem install bundler
-
-echo "export LC_ALL=en_US.UTF-8" > $IROOT/rbx-2.5.installed
-echo "export LANG=en_US.UTF-8" >> $IROOT/rbx-2.5.installed
-echo "export RBX_VERSION=${RBX_VERSION}" >> $IROOT/rbx-2.5.installed
-
-source $IROOT/rbx-2.5.installed