Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Improve process for adding runtimes and frameworks: DEA

- Remove runtime info from DEA config

- Fix runtimes.yml indentation

- Match runtimes.yml LD_LIBRARY_PATHs to DEA config

- Bump DEA pointer
git shortlog 48960e6a..431b79c7
Anfernee Gui (1):
      Raise the level of some logs to warning

Jennifer Hickey (1):
      Improve process for adding runtimes and frameworks

Change-Id: I58fac2afc121bd5c6aa7312c9ebb8285859d5e60
  • Loading branch information...
commit fd7e62237ad50c32bca535778b895296c7b1a116 1 parent f82f989
Jennifer Hickey authored
View
168 jobs/cloud_controller/templates/runtimes.yml
@@ -1,92 +1,92 @@
---
java:
- description: Java 6
- version: 1.6
- executable: /var/vcap/packages/dea_jvm/bin/java
- staging: /var/vcap/packages/ruby/bin/ruby stage
- version_output: 1.6.0
- version_flag: '-version'
- environment:
- PATH: /var/vcap/packages/ruby/bin:/var/vcap/packages/dea_jvm/bin:/var/vcap/packages/imagemagick/bin:$PATH
- JAVA_HOME: /var/vcap/packages/dea_jvm
- LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LIBRARY_PATH'
- debug_env:
- run:
- - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=n"
- suspend:
- - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=y"
+ description: Java 6
+ version: 1.6
+ executable: /var/vcap/packages/dea_jvm/bin/java
+ staging: /var/vcap/packages/ruby/bin/ruby stage
+ version_output: 1.6.0
+ version_flag: '-version'
+ environment:
+ PATH: /var/vcap/packages/ruby/bin:/var/vcap/packages/dea_jvm/bin:/var/vcap/packages/imagemagick/bin:$PATH
+ JAVA_HOME: /var/vcap/packages/dea_jvm
+ LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
+ debug_env:
+ run:
+ - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=n"
+ suspend:
+ - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=y"
java7:
- description: Java 7
- version: 1.7
- executable: /var/vcap/packages/dea_jvm7/bin/java
- staging: /var/vcap/packages/ruby/bin/ruby stage
- version_output: 1.7.0
- version_flag: '-version'
- environment:
- PATH: /var/vcap/packages/ruby/bin:/var/vcap/packages/dea_jvm7/bin:/var/vcap/packages/imagemagick/bin:$PATH
- JAVA_HOME: /var/vcap/packages/dea_jvm7
- LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LIBRARY_PATH'
- debug_env:
- run:
- - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=n"
- suspend:
- - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=y"
+ description: Java 7
+ version: 1.7
+ executable: /var/vcap/packages/dea_jvm7/bin/java
+ staging: /var/vcap/packages/ruby/bin/ruby stage
+ version_output: 1.7.0
+ version_flag: '-version'
+ environment:
+ PATH: /var/vcap/packages/ruby/bin:/var/vcap/packages/dea_jvm7/bin:/var/vcap/packages/imagemagick/bin:$PATH
+ JAVA_HOME: /var/vcap/packages/dea_jvm7
+ LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LIBRARY_PATH'
+ debug_env:
+ run:
+ - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=n"
+ suspend:
+ - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=y"
node:
- version: '0.4.12'
- description: "Node.js"
- executable: /var/vcap/packages/dea_node04/bin/node
- npm: /var/vcap/packages/dea_node04/npm/bin/npm-cli.js
- staging: /var/vcap/packages/ruby/bin/ruby stage
- version_output: 0.4.12
- version_flag: '-v'
- environment:
- LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LIBRARY_PATH'
- PATH: /var/vcap/packages/imagemagick/bin:/var/vcap/packages/dea_node04/bin:$PATH
+ version: '0.4.12'
+ description: "Node.js"
+ executable: /var/vcap/packages/dea_node04/bin/node
+ npm: /var/vcap/packages/dea_node04/npm/bin/npm-cli.js
+ staging: /var/vcap/packages/ruby/bin/ruby stage
+ version_output: 0.4.12
+ version_flag: '-v'
+ environment:
+ LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
+ PATH: /var/vcap/packages/imagemagick/bin:/var/vcap/packages/dea_node04/bin:$PATH
node06:
- version: '0.6.8'
- description: "Node.js"
- executable: /var/vcap/packages/dea_node06/bin/node
- npm: /var/vcap/packages/dea_node06/bin/npm
- staging: /var/vcap/packages/ruby/bin/ruby stage
- version_output: 0.6.8
- version_flag: '-v'
- environment:
- LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LIBRARY_PATH'
- PATH: /var/vcap/packages/imagemagick/bin:/var/vcap/packages/dea_node06/bin:$PATH
+ version: '0.6.8'
+ description: "Node.js"
+ executable: /var/vcap/packages/dea_node06/bin/node
+ npm: /var/vcap/packages/dea_node06/bin/npm
+ staging: /var/vcap/packages/ruby/bin/ruby stage
+ version_output: 0.6.8
+ version_flag: '-v'
+ environment:
+ LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
+ PATH: /var/vcap/packages/imagemagick/bin:/var/vcap/packages/dea_node06/bin:$PATH
node08:
- version: '0.8.2'
- description: "Node.js"
- executable: /var/vcap/packages/dea_node08/bin/node
- npm: /var/vcap/packages/dea_node08/bin/npm
- staging: /var/vcap/packages/ruby/bin/ruby stage
- version_output: 0.8.2
- version_flag: '-v'
- environment:
- PATH: /var/vcap/packages/imagemagick/bin:/var/vcap/packages/dea_node08/bin:$PATH
- LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
+ version: '0.8.2'
+ description: "Node.js"
+ executable: /var/vcap/packages/dea_node08/bin/node
+ npm: /var/vcap/packages/dea_node08/bin/npm
+ staging: /var/vcap/packages/ruby/bin/ruby stage
+ version_output: 0.8.2
+ version_flag: '-v'
+ environment:
+ PATH: /var/vcap/packages/imagemagick/bin:/var/vcap/packages/dea_node08/bin:$PATH
+ LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
ruby18:
- description: Ruby 1.8
- version: 1.8.7
- executable: /var/vcap/packages/dea_ruby18/bin/ruby
- staging: /var/vcap/packages/ruby/bin/ruby stage
- version_output: 1.8.7
- version_flag: "-e 'puts RUBY_VERSION'"
- additional_checks: "-e 'puts RUBY_PATCHLEVEL >= 174'"
- environment:
- LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LIBRARY_PATH'
- BUNDLE_GEMFILE:
- PATH: /var/vcap/packages/imagemagick/bin:/var/vcap/packages/dea_transition/rubygems/1.8/bin:/var/vcap/packages/dea_ruby18/bin:$PATH
- GEM_PATH: /var/vcap/packages/dea_transition/rubygems/1.8:$GEM_PATH
+ description: Ruby 1.8
+ version: 1.8.7
+ executable: /var/vcap/packages/dea_ruby18/bin/ruby
+ staging: /var/vcap/packages/ruby/bin/ruby stage
+ version_output: 1.8.7
+ version_flag: "-e 'puts RUBY_VERSION'"
+ additional_checks: "-e 'puts RUBY_PATCHLEVEL >= 174'"
+ environment:
+ LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
+ BUNDLE_GEMFILE:
+ PATH: /var/vcap/packages/imagemagick/bin:/var/vcap/packages/dea_transition/rubygems/1.8/bin:/var/vcap/packages/dea_ruby18/bin:$PATH
+ GEM_PATH: /var/vcap/packages/dea_transition/rubygems/1.8:$GEM_PATH
ruby19:
- description: Ruby 1.9
- version: 1.9.2p180
- executable: /var/vcap/packages/dea_ruby19/bin/ruby
- staging: /var/vcap/packages/ruby/bin/ruby stage
- version_output: 1.9.2
- version_flag: "-e 'puts RUBY_VERSION'"
- additional_checks: "-e 'puts RUBY_PATCHLEVEL >= 180'"
- environment:
- LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LIBRARY_PATH'
- BUNDLE_GEMFILE:
- PATH: /var/vcap/packages/imagemagick/bin:/var/vcap/packages/dea_transition/rubygems/1.9.1/bin:/var/vcap/packages/dea_ruby19/bin:$PATH
- GEM_PATH: /var/vcap/packages/dea_transition/rubygems/1.9.1:$GEM_PATH
+ description: Ruby 1.9
+ version: 1.9.2p180
+ executable: /var/vcap/packages/dea_ruby19/bin/ruby
+ staging: /var/vcap/packages/ruby/bin/ruby stage
+ version_output: 1.9.2
+ version_flag: "-e 'puts RUBY_VERSION'"
+ additional_checks: "-e 'puts RUBY_PATCHLEVEL >= 180'"
+ environment:
+ LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
+ BUNDLE_GEMFILE:
+ PATH: /var/vcap/packages/imagemagick/bin:/var/vcap/packages/dea_transition/rubygems/1.9.1/bin:/var/vcap/packages/dea_ruby19/bin:$PATH
+ GEM_PATH: /var/vcap/packages/dea_transition/rubygems/1.9.1:$GEM_PATH
View
70 jobs/dea/templates/dea.yml.erb
@@ -25,66 +25,10 @@ prod: <%= properties.dea.prod || false %>
# version flags are assumed to be '-v' unless noted below.
runtimes:
- ruby18:
- executable: /var/vcap/packages/dea_ruby18/bin/ruby
- version: 1.8.7
- version_flag: "-e 'puts RUBY_VERSION'"
- additional_checks: "-e 'puts RUBY_PATCHLEVEL >= 174'"
- environment:
- PATH: /var/vcap/packages/imagemagick/bin:$PATH
- LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
- ruby19:
- executable: /var/vcap/packages/dea_ruby19/bin/ruby
- version: 1.9.2
- version_flag: "-e 'puts RUBY_VERSION'"
- additional_checks: "-e 'puts RUBY_PATCHLEVEL >= 180'"
- environment:
- PATH: /var/vcap/packages/imagemagick/bin:$PATH
- LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
- node:
- executable: /var/vcap/packages/dea_node04/bin/node
- version: 0.4.12
- version_flag: '-v'
- environment:
- PATH: /var/vcap/packages/imagemagick/bin:$PATH
- LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
- node06:
- executable: /var/vcap/packages/dea_node06/bin/node
- version: 0.6.8
- version_flag: '-v'
- environment:
- PATH: /var/vcap/packages/imagemagick/bin:$PATH
- LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
- node08:
- executable: /var/vcap/packages/dea_node08/bin/node
- version: 0.8.2
- version_flag: '-v'
- environment:
- PATH: /var/vcap/packages/imagemagick/bin:$PATH
- LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
- java:
- executable: /var/vcap/packages/dea_jvm/bin/java
- version: 1.6.0
- version_flag: '-version'
- environment:
- PATH: /var/vcap/packages/ruby/bin:/var/vcap/packages/imagemagick/bin:$PATH
- JAVA_HOME: /var/vcap/packages/dea_jvm
- LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
- debug_env:
- run:
- - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=n"
- suspend:
- - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=y"
- java7:
- executable: /var/vcap/packages/dea_jvm7/bin/java
- version: 1.7.0
- version_flag: '-version'
- environment:
- PATH: /var/vcap/packages/ruby/bin:/var/vcap/packages/imagemagick/bin:$PATH
- JAVA_HOME: /var/vcap/packages/dea_jvm7
- LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LIBRARY_PATH'
- debug_env:
- run:
- - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=n"
- suspend:
- - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=y"
+ - ruby18
+ - ruby19
+ - node
+ - node06
+ - node08
+ - java
+ - java7
2  src/dea
@@ -1 +1 @@
-Subproject commit 48960e6a6fd81a308d7df2f8da6576b16e35f50d
+Subproject commit 431b79c7e30806007116fec0f98ec01d90da130c
Please sign in to comment.
Something went wrong with that request. Please try again.