From 6528c5f838d4677399c29843c08e58da8ca93c66 Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Wed, 7 May 2014 07:25:48 -0500 Subject: [PATCH 1/3] VRFS-1651 - our gems aren't even needed for this --- web/Gemfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/Gemfile b/web/Gemfile index 2595343ce..04aa5a161 100644 --- a/web/Gemfile +++ b/web/Gemfile @@ -12,6 +12,12 @@ if devenv gem 'jampb', :path => "../pb/target/ruby/jampb" gem 'jam_ruby', :path => "../ruby" gem 'jam_websockets', :path => "../websocket-gateway" +elsif ENV["TEST_WWW"] == "1" + gem 'jam_db' + gem 'jampb' + gem 'jam_ruby' + gem 'jam_websockets' + ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" else gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}" From fb1d634875207b09d71bae900182a5cd937911b3 Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Wed, 7 May 2014 07:33:33 -0500 Subject: [PATCH 2/3] VRFS-1651 - jam_ gem version does not matter for test_www --- admin/Gemfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/admin/Gemfile b/admin/Gemfile index 8a47660de..92f868792 100644 --- a/admin/Gemfile +++ b/admin/Gemfile @@ -7,6 +7,12 @@ if devenv gem 'jam_db', :path=> "../db/target/ruby_package" gem 'jampb', :path => "../pb/target/ruby/jampb" gem 'jam_ruby', :path => "../ruby" +elsif ENV["TEST_WWW"] == "1" + gem 'jam_db' + gem 'jampb' + gem 'jam_ruby' + gem 'jam_websockets' + ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" else gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}" From 1fa9ffcc3f75528e2cfd2307820fae4584509144 Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Wed, 7 May 2014 07:40:22 -0500 Subject: [PATCH 3/3] VRFS-1651 - really no jam_* gems in test-www --- admin/Gemfile | 8 ++++---- ruby/Gemfile | 4 ++++ web/Gemfile | 8 ++++---- websocket-gateway/Gemfile | 5 +++++ 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/admin/Gemfile b/admin/Gemfile index 92f868792..79f539f53 100644 --- a/admin/Gemfile +++ b/admin/Gemfile @@ -8,10 +8,10 @@ if devenv gem 'jampb', :path => "../pb/target/ruby/jampb" gem 'jam_ruby', :path => "../ruby" elsif ENV["TEST_WWW"] == "1" - gem 'jam_db' - gem 'jampb' - gem 'jam_ruby' - gem 'jam_websockets' + #gem 'jam_db' + #gem 'jampb' + #gem 'jam_ruby' + #gem 'jam_websockets' ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" else gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}" diff --git a/ruby/Gemfile b/ruby/Gemfile index 252c1f546..65e0891a0 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -9,6 +9,10 @@ devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment vari if devenv gem 'jam_db', :path=> "../db/target/ruby_package" gem 'jampb', :path => "../pb/target/ruby/jampb" +elsif ENV["TEST_WWW"] == "1" + #gem 'jam_db' + #gem 'jampb' + ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" else gem 'jam_db' gem 'jampb' diff --git a/web/Gemfile b/web/Gemfile index 04aa5a161..406e4db1b 100644 --- a/web/Gemfile +++ b/web/Gemfile @@ -13,10 +13,10 @@ if devenv gem 'jam_ruby', :path => "../ruby" gem 'jam_websockets', :path => "../websocket-gateway" elsif ENV["TEST_WWW"] == "1" - gem 'jam_db' - gem 'jampb' - gem 'jam_ruby' - gem 'jam_websockets' + #gem 'jam_db' + #gem 'jampb' + #gem 'jam_ruby' + #gem 'jam_websockets' ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" else gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}" diff --git a/websocket-gateway/Gemfile b/websocket-gateway/Gemfile index 1f7444ad8..e76e66265 100644 --- a/websocket-gateway/Gemfile +++ b/websocket-gateway/Gemfile @@ -11,6 +11,11 @@ if devenv gem 'jam_db', :path=> "../db/target/ruby_package" gem 'jampb', :path => "../pb/target/ruby/jampb" gem 'jam_ruby', :path => "../ruby" +elsif ENV["TEST_WWW"] == "1" + #gem 'jam_db' + #gem 'jampb' + #gem 'jam_ruby' + ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" else gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}"