Merge lp:~bigkevmcd/offspring/dont-duplicate-automated-builds into lp:offspring

[Kevin McDermott]

This is a fix for the nightly builds, that prevents duplicate builds when the project is already in a DailyBuildOrder.

If the project is active, and is a DailyBuildOrder project, then it will not be picked up by the build_active_projects functionality.

[Cody A.W. Somerville (cody-somerville)]

The is_active attribute is more or less been re-purposed to be "Build Nightly" per front-end UI (ie. We show projects on main page if active OR project has daily build order PLUS the edit page in front-end has a label 'Build Nightly?').

The nightly build functionality was not intended to be conflated with daily build orders. The original purpose of this feature was to have projects build a second time so that both NA and APAC region employees would have a fresh build to work with at the start of the work day. Projects that did not want the NA build would toggle the is_active flag (this is why we modified the active project listing to also show projects with a DBO).

So yes, I agree there is a problem for sure. However, I feel like this implementation only extends how deep this rabbit hole goes. I would recommend an alternative implementation such as finishing the refactoring of is_active OR getting rid of that attribute all together and using JUST daily build orders. In the very least, IMHO, this patchset needs to address the UX issue.

review: Needs Fixing (design/architecture)

Unmerged revisions

155. By Kevin McDermott on 2012-12-13

Fix for this issue.

154. By Kevin McDermott on 2012-12-13

Failing test for this.

=== modified file 'lib/offspring/master/tests/test_utils.py'
--- lib/offspring/master/tests/test_utils.py	2012-06-12 14:32:48 +0000
+++ lib/offspring/master/tests/test_utils.py	2012-12-13 13:56:46 +0000
@@ -104,6 +104,24 @@
         self.assertEqual(self.project, build_request.project)
         self.assertEqual(u"Nightly build", build_request.reason)
 
+    def test_build_active_projects_with_daily_build_order(self):
+        """
+        In order not to build the same projects twice, if a Project has a
+        BuildOrder, then it shouldn't be built during the daily active build
+        cron run.
+        """
+        self.assertEqual(0, self.db_store.find(BuildRequest).count())
+        current_hour = datetime.now(tz.tzlocal()).hour
+        build_order = DailyBuildOrder(self.project.name, current_hour)
+        self.db_store.add(build_order)
+        build_order_project = DailyBuildOrderProject()
+        build_order_project.dailybuildorder_id = build_order.id
+        build_order_project.project_id = self.project.name
+        self.db_store.add(build_order_project)
+
+        build_active_projects(self.db_store)
+        self.assertEqual(0, self.db_store.find(BuildRequest).count())
+
 
 class TestProcessPendingBuildOrders(BaseOffspringMasterTestCase):
 
 
=== modified file 'lib/offspring/master/utils.py'
--- lib/offspring/master/utils.py	2011-11-17 12:21:03 +0000
+++ lib/offspring/master/utils.py	2012-12-13 13:56:46 +0000
@@ -4,9 +4,10 @@
 from datetime import datetime
 
 from storm import tz
-from storm.locals import create_database, Store
+from storm.locals import create_database, Store, Not
 
-from offspring.master.models import BuildRequest, DailyBuildOrder, Project
+from offspring.master.models import (
+    BuildRequest, DailyBuildOrder, DailyBuildOrderProject, Project)
 from offspring.config import get_configuration
 
 
@@ -16,8 +17,11 @@
         config = get_configuration()
         database = create_database(config.get("master", "db"))
         db_store = Store(database)
-    activeProjects = db_store.find(Project, Project.is_active == True)
-    for project in activeProjects:
+    daily_build_orders = db_store.find(DailyBuildOrderProject)
+    daily_build_projects = daily_build_orders.values(DailyBuildOrderProject.project_id)
+    active_projects = db_store.find(Project, Project.is_active == True,
+        Not(Project.name.is_in(daily_build_projects)))
+    for project in active_projects:
         request = BuildRequest(project, project.priority, u"Nightly build")
         db_store.add(request)
     db_store.commit()