Skip to content

Commit

Permalink
bump assets submodule pointer and update test config files
Browse files Browse the repository at this point in the history
Change-Id: I97ebb91391c6fe7a2a44d2f59530e86e210f4387
  • Loading branch information
Winston Koh committed Oct 26, 2011
1 parent 16080a8 commit 261ad5e
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 6 deletions.
13 changes: 9 additions & 4 deletions Rakefile
Expand Up @@ -13,9 +13,6 @@ import "#{vcap}/rakelib/bundler.rake"
desc "Run the Basic Viability Tests"
task :tests => ['build','bvt:run']

desc "Run a faster subset of Basic Viability Tests"
task :smoke_tests => ['build','bvt:run_smoke']

ci_steps = ['ci:version_check',
'build',
'bundler:install:production',
Expand Down Expand Up @@ -45,7 +42,15 @@ BUILD_ARTIFACT = File.join(Dir.pwd, ".build")
TESTS_TO_BUILD = ["#{TESTS_PATH}/spring/auto-reconfig-test-app",
"#{TESTS_PATH}/spring/auto-reconfig-missing-deps-test-app",
"#{TESTS_PATH}/spring/app_spring_service",
"#{TESTS_PATH}/java_web/app_with_startup_delay"
"#{TESTS_PATH}/java_web/app_with_startup_delay",
"#{TESTS_PATH}/java_web/tomcat-version-check-app",
"#{TESTS_PATH}/spring/roo-guestbook",
"#{TESTS_PATH}/spring/jpa-guestbook",
"#{TESTS_PATH}/spring/hibernate-guestbook",
"#{TESTS_PATH}/java_web/java_tiny_app",
"#{TESTS_PATH}/lift/hello_lift",
"#{TESTS_PATH}/lift/lift-db-app"

]

desc "Build the tests. If the git hash associated with the test assets has not changed, nothing is built. To force a build, invoke 'rake build[--force]'"
Expand Down
2 changes: 1 addition & 1 deletion assets
27 changes: 26 additions & 1 deletion features/support/testconfig.yml
Expand Up @@ -8,83 +8,99 @@ sleep_secs: 1
simple_app:
framework: "http://b20nine.com/unknown"
startup: "ruby foo.rb"
path: "assets/sinatra/hello_vcap"

tiny_java_app:
framework: "java_web/1.0"
startup: "thin start"
path: "assets/java_web/java_tiny_app/target"

simple_db_app:
framework: "http://b20nine.com/unknown"
startup: "ruby simple_db_app.rb"
path: "assets/sinatra/simple_db_app"

redis_lb_app:
framework: "http://b20nine.com/unknown"
startup: "ruby redis_lb.rb"
path: "assets/sinatra/redis_lb_app"

env_test_app:
framework: "http://b20nine.com/unknown"
startup: "ruby env_test.rb"
path: "assets/sinatra/env_test_app"

broken_app:
framework: "http://b20nine.com/unknown"
startup: "ruby broken.rb"
path: "assets/sinatra/broken_app"

rails3_app:
framework: "rails/1.0"
startup: "thin start"
memory: 256
path: "assets/rails3/rails3_app"

jpa_app:
framework: "spring_web/1.0"
startup: "thin start"
memory: 256
path: "assets/spring/jpa-guestbook/target"

hibernate_app:
framework: "spring_web/1.0"
startup: "thin start"
memory: 256
path: "assets/spring/hibernate-guestbook/target"

dbrails_app:
framework: "rails/1.0"
startup: "thin start"
memory: 256
path: "assets/rails3/dbrails_app"

dbrails_broken_app:
framework: "rails/1.0"
startup: "thin start"
memory: 256
path: "assets/rails3/dbrails_broken_app"

grails_app:
framework: "grails/1.0"
startup: "thin start"
memory: 512
path: "assets/grails/guestbook/target"

roo_app:
framework: "spring_web/1.0"
startup: "thin start"
memory: 256

path: "assets/spring/roo-guestbook/target"

mochiweb_test:
framework: "otp_rebar"
startup: erlangR14B02
memory: 64
path: "assets/mochiweb/mochiweb_test"

simple-lift-app:
framework: "lift/1.0"
startup: "thin start"
memory: 256
path: "assets/lift/hello_lift/target"

lift-db-app:
framework: "lift/1.0"
startup: "thin start"
memory: 512
path: "assets/lift/lift-db-app/target"

tomcat-version-check-app:
framework: "spring_web/1.0"
startup: "thin start"
memory: 128
tomcat_version: "6.0.32"
path: "assets/java_web/tomcat-version-check-app/target"

app_rails_service:
framework: "rails/1.0"
Expand Down Expand Up @@ -114,30 +130,37 @@ my_test_app_env_test_app:
framework: "http://b20nine.com/unknown"
startup: "ruby foo.rb"
memory: 64
path: "assets/sinatra/hello_vcap"

neo4j_app:
framework: "http://b20nine.com/unknown"
startup: "ruby neo4j.rb"
memory: 256
path: "assets/sinatra/neo4j_app"

simple_wsgi_app:
framework: "wsgi"
path: "assets/django/simple_wsgi_app"

wsgi_app_with_requirements:
framework: "wsgi"
path: "assets/django/wsgi_app_with_requirements"

simple_django_app:
framework: "django"
path: "assets/django/simple_django_app"

simple_php_app:
framework: "php"
startup: php
memory: 64
path: "assets/php/simple_php_app"

spring-env-app:
framework: "spring_web/1.0"
startup: "thin start"
memory: 256
path: "assets/spring/spring-env/target"

auto-reconfig-test-app:
framework: "spring_web/1.0"
Expand All @@ -154,10 +177,12 @@ auto-reconfig-missing-deps-test-app:
simple_kv_app:
framework: "http://b20nine.com/unknown"
startup: "thin start"
path: "assets/sinatra/simple_kv_app"

brokered_service_app:
framework: "http://b20nine.com/unknown"
startup: "thin start"
path: "assets/sinatra/brokered_service_app"

java_app_with_startup_delay:
framework: "java_web/1.0"
Expand Down

0 comments on commit 261ad5e

Please sign in to comment.