Merge lp:~timrchavez/offspring/fix-lp-1095621 into lp:offspring

[Timothy R. Chavez]

Introduce a 'is_retired' attribute for Lexbuilder which denotes that the builder has permanently been removed from service. This is different from 'is_active=False' which denotes that a builder is not accepting build jobs due to some intermittent disruption like an on-going upgrade or downtime caused by hardware failure. The "is_retired" flag will hide builders when set to true in the Builders List view and 404 on Builders Detail view. They will not get scanned by the master nor selected for building. They will remain visible in the admin (but the is_retired flag is exposed and filterable for the admin's convenience)

[Kevin McDermott (bigkevmcd)]

Looks good to me, +1

review: Approve

[David Murphy (schwuk)]

81 + def test_create_builders_does_not_return_retired_builders(self):

Should that not be "test_get_builders_does_not_return_retired_builders"?

review: Needs Information

[Timothy R. Chavez (timrchavez)]

Good catch Dave. Yep.

[lp:~timrchavez/offspring/fix-lp-1095621]

165. By Timothy R. Chavez on 2013-05-23

Fix sed replace error in test name.

=== modified file 'lib/offspring/master/master.py'
--- lib/offspring/master/master.py	2013-03-06 21:42:53 +0000
+++ lib/offspring/master/master.py	2013-05-23 13:57:23 +0000
@@ -97,7 +97,7 @@
         self.is_online = False
 
     def _get_builders(self):
-        return self.db_store.find(Lexbuilder)
+        return self.db_store.find(Lexbuilder, Lexbuilder.is_retired == False)
 
     def scanSlaves(self):
         """
@@ -190,6 +190,7 @@
                     Lexbuilder.current_state == LexbuilderSlave.STATE_IDLE,
                     Lexbuilder.is_active == True,
                     Lexbuilder.is_okay == True,
+                    Lexbuilder.is_retired == False,
                     Lexbuilder.machine_type.is_in(builder_types)
                 ).order_by(Lexbuilder.id).first()
             if builder is not None:

=== modified file 'lib/offspring/master/models.py'
--- lib/offspring/master/models.py	2012-03-08 18:30:04 +0000
+++ lib/offspring/master/models.py	2013-05-23 13:57:23 +0000
@@ -34,6 +34,7 @@
     updated_at = DateTime()
     is_active = Bool(default=True)
     is_okay = Bool(default=True)
+    is_retired = Bool(default=False)
     current_job_id = Int()
     current_job = Reference(current_job_id, "BuildResult.id")
     notes = Unicode()

=== modified file 'lib/offspring/master/tests/helpers.py'
--- lib/offspring/master/tests/helpers.py	2013-03-05 11:31:40 +0000
+++ lib/offspring/master/tests/helpers.py	2013-05-23 13:57:23 +0000
@@ -177,7 +177,8 @@
               "'UTC'), "
             "current_job_id INTEGER, "
             "is_okay BOOLEAN NOT NULL, "
-            "is_active BOOLEAN NOT NULL DEFAULT TRUE)")
+            "is_active BOOLEAN NOT NULL DEFAULT TRUE, "
+            "is_retired BOOLEAN NOT NULL DEFAULT FALSE)")
 
         self.connection.execute(
             "CREATE TABLE buildrequests ("

=== modified file 'lib/offspring/master/tests/test_master.py'
--- lib/offspring/master/tests/test_master.py	2013-03-06 21:42:53 +0000
+++ lib/offspring/master/tests/test_master.py	2013-05-23 13:57:23 +0000
@@ -29,17 +29,18 @@
         return LexbuilderMaster(self.config, self.db_store,
                                 mailer=self.mailer.mail)
 
-    def create_builder(self, current_state=Slave.STATE_IDLE, arch=None):
+    def create_builder(self, **kwargs):
         """
         Create and add a Lexbuilder to the store.
         """
-        builder = Lexbuilder(u"http://myhost/")
-        builder.name = u"test-builder"
+        builder = Lexbuilder(kwargs.get("uri", u"http://myhost/"))
+        builder.name = unicode(kwargs.get("name", "test-builder"))
         builder.previous_state = Slave.STATE_IDLE
-        builder.current_state = current_state
-        builder.is_active = True
-        builder.is_okay = True
-        builder.machine_type = arch or self.project.arch
+        builder.current_state = kwargs.get("current_state", Slave.STATE_IDLE)
+        builder.is_active = kwargs.get("is_active", True)
+        builder.is_okay = kwargs.get("is_okay", True)
+        builder.is_retired = kwargs.get("is_retired", False)
+        builder.machine_type = kwargs.get("arch", self.project.arch)
         self.db_store.add(builder)
         return builder
 
@@ -218,6 +219,19 @@
             "Scan cycle completed\n" % {"builder": builder.name},
             log_file.getvalue())
 
+    def test_get_builders_does_not_return_retired_builders(self):
+        """
+        Test that retired builders are not returned by _get_builders() which
+        is the function the scanner uses to get a list of builders to scan.
+        """
+        master = self.get_master()
+        builder1 = self.create_builder(name="BuilderA", is_retired=True)
+        builder2 = self.create_builder(name="BuilderB", is_active=False)
+        builder3 = self.create_builder(name="BuilderC")
+        builders = master._get_builders()
+        self.assertEqual(2, builders.count())
+        self.assertEqual(["BuilderB", "BuilderC"], list(builders.values(Lexbuilder.name)))
+
     def test_dispatch_builds(self):
         """
         dispatchBuilds sends BuildRequests to a slave.

=== modified file 'lib/offspring/web/queuemanager/admin.py'
--- lib/offspring/web/queuemanager/admin.py	2013-05-09 14:27:56 +0000
+++ lib/offspring/web/queuemanager/admin.py	2013-05-23 13:57:23 +0000
@@ -19,8 +19,11 @@
 
 
 class LexbuilderAdmin(admin.ModelAdmin):
-    list_display = ('name', 'machine_type', 'is_active', 'is_okay', 'current_state', 'current_build', 'updated_at')
-    list_filter = ['current_state', 'machine_type', 'is_active', 'is_okay']
+    list_display = ('name', 'machine_type', 'is_active', 'is_okay',
+                    'is_retired', 'current_state', 'current_build',
+                    'updated_at')
+    list_filter = ['current_state', 'machine_type', 'is_active',
+                   'is_okay', 'is_retired']
     actions=['make_enabled', 'make_disabled']
 
     def make_disabled(self, request, queryset):

=== added file 'lib/offspring/web/queuemanager/migrations/0003_auto__add_field_lexbuilder_is_retired.py'
--- lib/offspring/web/queuemanager/migrations/0003_auto__add_field_lexbuilder_is_retired.py	1970-01-01 00:00:00 +0000
+++ lib/offspring/web/queuemanager/migrations/0003_auto__add_field_lexbuilder_is_retired.py	2013-05-23 13:57:23 +0000
@@ -0,0 +1,173 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'Lexbuilder.is_retired'
+        db.add_column('lexbuilders', 'is_retired', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'Lexbuilder.is_retired'
+        db.delete_column('lexbuilders', 'is_retired')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 5, 22, 4, 7, 28, 104849)'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 5, 22, 4, 7, 28, 104782)'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'django_group_access.accessgroup': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'AccessGroup'},
+            'auto_share_groups': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'auto_share_groups_rel_+'", 'blank': 'True', 'to': "orm['django_group_access.AccessGroup']"}),
+            'can_be_shared_with': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'can_share_with': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['django_group_access.AccessGroup']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'symmetrical': 'False', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}),
+            'supergroup': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'queuemanager.buildrequest': {
+            'Meta': {'object_name': 'BuildRequest', 'db_table': "'buildrequests'"},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['queuemanager.Project']", 'db_column': "'project_name'"}),
+            'reason': ('django.db.models.fields.TextField', [], {'max_length': '200', 'blank': 'True'}),
+            'requestor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'db_column': "'requestor_id'", 'blank': 'True'}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '10'})
+        },
+        'queuemanager.buildresult': {
+            'Meta': {'object_name': 'BuildResult', 'db_table': "'buildresults'"},
+            'builder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['queuemanager.Lexbuilder']", 'null': 'True', 'blank': 'True'}),
+            'dispatched_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'finished_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'notes': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['queuemanager.Project']", 'db_column': "'project_name'"}),
+            'reason': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'requested_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
+            'requestor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'db_column': "'requestor_id'", 'blank': 'True'}),
+            'result': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True'}),
+            'started_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'queuemanager.dailybuildorder': {
+            'Meta': {'object_name': 'DailyBuildOrder', 'db_table': "'dailybuildorders'"},
+            'hour': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'projects': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['queuemanager.Project']", 'symmetrical': 'False'})
+        },
+        'queuemanager.launchpadproject': {
+            'Meta': {'object_name': 'LaunchpadProject', 'db_table': "'launchpad_projects'"},
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200', 'primary_key': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        'queuemanager.launchpadprojectmilestone': {
+            'Meta': {'object_name': 'LaunchpadProjectMilestone', 'db_table': "'launchpad_project_milestones'"},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'date_targeted': ('django.db.models.fields.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'launchpad_project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['queuemanager.LaunchpadProject']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'queuemanager.lexbuilder': {
+            'Meta': {'object_name': 'Lexbuilder', 'db_table': "'lexbuilders'"},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'current_job': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['queuemanager.BuildResult']", 'null': 'True', 'db_column': "'current_job_id'", 'blank': 'True'}),
+            'current_state': ('django.db.models.fields.CharField', [], {'default': "'UNKNOWN'", 'max_length': '200'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_okay': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_retired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'machine_type': ('django.db.models.fields.CharField', [], {'default': "'x86_64'", 'max_length': '200'}),
+            'name': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '200', 'db_index': 'True'}),
+            'notes': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'previous_state': ('django.db.models.fields.CharField', [], {'default': "'UNKNOWN'", 'max_length': '200'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'uri': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'queuemanager.project': {
+            'Meta': {'object_name': 'Project', 'db_table': "'projects'"},
+            'access_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['django_group_access.AccessGroup']", 'null': 'True', 'blank': 'True'}),
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'config_url': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'launchpad_project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['queuemanager.LaunchpadProject']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '200', 'primary_key': 'True', 'db_index': 'True'}),
+            'notes': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'project_owner'", 'null': 'True', 'to': "orm['auth.User']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'default': '50'}),
+            'project_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['queuemanager.ProjectGroup']", 'null': 'True', 'blank': 'True'}),
+            'series': ('django.db.models.fields.CharField', [], {'default': "'lucid'", 'max_length': '200'}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True'}),
+            'suite': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+        },
+        'queuemanager.projectgroup': {
+            'Meta': {'object_name': 'ProjectGroup', 'db_table': "'projectgroups'"},
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200', 'primary_key': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'queuemanager.projectnotificationsubscription': {
+            'Meta': {'object_name': 'ProjectNotificationSubscription', 'db_table': "'project_notification_subscriptions'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['queuemanager.Project']", 'db_column': "'project_name'"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'db_column': "'user_id'"})
+        },
+        'queuemanager.release': {
+            'Meta': {'object_name': 'Release', 'db_table': "'releases'"},
+            'build': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['queuemanager.BuildResult']", 'unique': 'True', 'primary_key': 'True'}),
+            'checklist_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'milestone': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['queuemanager.LaunchpadProjectMilestone']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'published_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'status': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
+            'tag': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['queuemanager']

=== modified file 'lib/offspring/web/queuemanager/models.py'
--- lib/offspring/web/queuemanager/models.py	2013-05-17 13:49:22 +0000
+++ lib/offspring/web/queuemanager/models.py	2013-05-23 13:57:23 +0000
@@ -164,6 +164,7 @@
     updated_at = models.DateTimeField('date updated', auto_now=True)
     is_active = models.BooleanField(default=True)
     is_okay = models.BooleanField(default=True, editable=False)
+    is_retired = models.BooleanField(default=False)
     machine_type = models.CharField(max_length=200, default="x86_64")
     current_job = models.ForeignKey("BuildResult", db_column="current_job_id", editable=False, blank=True, null=True)
     notes = models.TextField('whiteboard', blank=True, null=True)

=== modified file 'lib/offspring/web/queuemanager/tests/test_views.py'
--- lib/offspring/web/queuemanager/tests/test_views.py	2013-01-31 18:36:58 +0000
+++ lib/offspring/web/queuemanager/tests/test_views.py	2013-05-23 13:57:23 +0000
@@ -275,6 +275,44 @@
             msg_prefix=response.content
         )
 
+class BuildersListViewTests(TestCase):
+    def setUp(self):
+        user = factory.make_user()
+        self.builder1 = factory.make_lexbuilder(
+            name="BuilderA", is_retired=True)
+        self.builder2 = factory.make_lexbuilder(name="BuilderB")
+        self.client.login(
+            username=user.username, password=user.username)
+
+    def test_builderslist_does_not_show_retired_builders(self):
+        """
+        Test builders list does not show retired builders.
+        """
+        response = self.client.get(reverse("builders_list"))
+        self.assertNotContains(
+            response, self.builder1.name, status_code=200,
+            msg_prefix=response.content)
+        self.assertContains(
+            response, self.builder2.name, status_code=200,
+            msg_prefix=response.content)
+
+class BuilderDetailsViewTests(TestCase):
+    def setUp(self):
+        user = factory.make_user()
+        self.builder1 = factory.make_lexbuilder(
+            name="BuilderA", is_retired=True)
+        self.builder2 = factory.make_lexbuilder(name="BuilderB")
+        self.client.login(
+            username=user.username, password=user.username)
+
+    def test_builderdetails_404s_for_retired_builders(self):
+        """
+        Test builder details are not available for retired builders.
+        """
+        response = self.client.get(reverse("builder_details", kwargs={'slug': self.builder1.name}))
+        self.assertEqual(response.status_code, 404)
+        response = self.client.get(reverse("builder_details", kwargs={'slug': self.builder2.name}))
+        self.assertEqual(response.status_code, 200)
 
 class BuildResultPublishViewTests(TestCase):
 

=== modified file 'lib/offspring/web/urls.py'
--- lib/offspring/web/urls.py	2013-01-22 10:00:39 +0000
+++ lib/offspring/web/urls.py	2013-05-23 13:57:23 +0000
@@ -58,13 +58,14 @@
     (r'^openid/', include('django_openid_auth.urls')),
     (r'^logout/', 'django.contrib.auth.views.logout'),
     (r'^builders/$', secure_object_list, {
-        'queryset' : Lexbuilder.objects.order_by("-is_active", "-machine_type", "-created_at"),
+        'queryset' : Lexbuilder.objects.filter(is_retired=False).order_by(
+            "-is_active", "-machine_type", "-created_at"),
         'template_name' : 'queuemanager/builders.html',
         'template_object_name' : 'builder',
         'extra_context' : { 'pillar' : 'builders', },
     }, 'builders_list'),
     (r'^builders/(?P<slug>[^/]+)/$', secure_object_detail, {
-        'queryset' : Lexbuilder.objects.all(),
+        'queryset' : Lexbuilder.objects.filter(is_retired=False),
         'slug_field' : 'name',
         'template_name' : 'queuemanager/builder_details.html',
         'template_object_name' : 'builder',