#405: added include_testing_subrepository to MassBuild

app/models/mass_build.rb

@@ -18,7 +18,8 @@ class MassBuild < ActiveRecord::Base
   attr_accessor :arches
   attr_accessible :arches, :auto_publish_status, :projects_list, :build_for_platform_id,
                   :extra_repositories, :extra_build_lists, :increase_release_tag,
-                  :use_cached_chroot, :use_extra_tests, :description, :extra_mass_builds
+                  :use_cached_chroot, :use_extra_tests, :description, :extra_mass_builds,
+                  :include_testing_subrepository
 
   validates :save_to_platform_id,
             :build_for_platform_id,

app/models/project.rb

@@ -195,6 +195,7 @@ class Project < ActiveRecord::Base
       bl.priority                       = priority
       bl.mass_build_id                  = mass_build.id
       bl.save_to_repository_id          = repository_id
+      bl.include_testing_subrepository  = mass_build.include_testing_subrepository?
       bl.use_cached_chroot              = mass_build.use_cached_chroot?
       bl.use_extra_tests                = mass_build.use_extra_tests?
     end

app/views/platforms/mass_builds/new.html.haml

@@ -52,7 +52,7 @@
     .both
     = f.select :auto_publish_status, auto_publish_statuses
     = f.label :auto_publish_status
-    - %i(increase_release_tag use_cached_chroot use_extra_tests).each do |field|
+    - %i(increase_release_tag include_testing_subrepository use_cached_chroot use_extra_tests).each do |field|
       .both
         = f.check_box field
         = f.label field

app/views/platforms/mass_builds/show.html.haml

@@ -30,6 +30,10 @@
     %td
       %b= t('activerecord.attributes.mass_build.increase_release_tag')
     %td= t("layout.#{@mass_build.increase_release_tag?}_")
+  %tr
+    %td
+      %b= t('activerecord.attributes.mass_build.include_testing_subrepository')
+    %td= t("layout.#{@mass_build.include_testing_subrepository?}_")
   %tr
     %td
       %b= t('activerecord.attributes.mass_build.use_cached_chroot')

config/locales/models/mass_build.en.yml

@@ -35,6 +35,7 @@ en:
         increase_release_tag: Increase release tag
         use_cached_chroot: Use cached chroot
         use_extra_tests: Use extra tests
+        include_testing_subrepository: "Include 'testing' subrepository"
         repositories: Repositories
         projects_list: Projects list
         build_for_platform: Build for platform

config/locales/models/mass_build.ru.yml

@@ -36,6 +36,7 @@ ru:
         increase_release_tag: Увеличить release тег
         use_cached_chroot: Использовать кэшированный chroot
         use_extra_tests: Использовать дополнительные тесты
+        include_testing_subrepository: "Подключить 'testing' подрепозиторий"
         repositories: Репозитории
         projects_list: Список проектов
         build_for_platform: Собрано для платформы

db/migrate/20140630205045_add_include_testing_subrepository_to_mass_builds.rb

@@ -0,0 +1,5 @@
+class AddIncludeTestingSubrepositoryToMassBuilds < ActiveRecord::Migration
+  def change
+    add_column :mass_builds, :include_testing_subrepository, :boolean, null: false, default: false
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140627173727) do
+ActiveRecord::Schema.define(version: 20140630205045) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -329,6 +329,7 @@ ActiveRecord::Schema.define(version: 20140627173727) do
     t.string   "description"
     t.string   "auto_publish_status",           default: "none", null: false
     t.text     "extra_mass_builds"
+    t.boolean  "include_testing_subrepository", default: false,  null: false
   end
 
   create_table "users", force: true do |t|