Don't ensure all keys in build_results are only written once, otherwise we get false positive builds reported.

1 files changed, 8 insertions, 9 deletions

diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index c3af1f0177..50f7f410fa 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -85,8 +85,8 @@ cd "#{root_dir}/activerecord" do
   puts "[CruiseControl] Building Active Record with MySQL IM enabled"
   puts
   ENV['IM'] = 'true'
-  build_results[:activerecord_mysql] = rake 'mysql:rebuild_databases', 'mysql:test'
-  build_results[:activerecord_mysql_isolated] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
+  build_results[:activerecord_mysql_IM] = rake 'mysql:rebuild_databases', 'mysql:test'
+  build_results[:activerecord_mysql_isolated_IM] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
@@ -103,8 +103,8 @@ cd "#{root_dir}/activerecord" do
   puts "[CruiseControl] Building Active Record with MySQL2 IM enabled"
   puts
   ENV['IM'] = 'true'
-  build_results[:activerecord_mysql2] = rake 'mysql:rebuild_databases', 'mysql2:test'
-  build_results[:activerecord_mysql2_isolated] = rake 'mysql:rebuild_databases', 'mysql2:isolated_test'
+  build_results[:activerecord_mysql2_IM] = rake 'mysql:rebuild_databases', 'mysql2:test'
+  build_results[:activerecord_mysql2_isolated_IM] = rake 'mysql:rebuild_databases', 'mysql2:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
@@ -121,8 +121,8 @@ cd "#{root_dir}/activerecord" do
   puts "[CruiseControl] Building Active Record with PostgreSQL IM enabled"
   puts
   ENV['IM'] = 'true'
-  build_results[:activerecord_postgresql8] = rake 'postgresql:rebuild_databases', 'postgresql:test'
-  build_results[:activerecord_postgresql8_isolated] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
+  build_results[:activerecord_postgresql8_IM] = rake 'postgresql:rebuild_databases', 'postgresql:test'
+  build_results[:activerecord_postgresql8_isolated_IM] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
@@ -139,8 +139,8 @@ cd "#{root_dir}/activerecord" do
   puts "[CruiseControl] Building Active Record with SQLite 3 IM enabled"
   puts
   ENV['IM'] = 'true'
-  build_results[:activerecord_sqlite3] = rake 'sqlite3:test'
-  build_results[:activerecord_sqlite3_isolated] = rake 'sqlite3:isolated_test'
+  build_results[:activerecord_sqlite3_IM] = rake 'sqlite3:test'
+  build_results[:activerecord_sqlite3_isolated_IM] = rake 'sqlite3:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
@@ -179,4 +179,3 @@ else
   puts "[CruiseControl] Failed components: #{failures.map { |component| component.first }.join(', ')}"
   exit(-1)
 end
-