Merge lp:~veebers/ci-director/ignore-multibranch-jobs into lp:ci-director

[Christopher Lee]

Ensure ci-director ignores multibranch jobs

Ensure ci-director ignores multibranch jobs

Currently a multibranch job will raise an exception within ci-director as it always expects a 'color' within a jobs info, multibranch jobs don't have this (as they are different to normal jobs).

This should be enough to allow us to create multibranch jobs without breaking ci-director (however there is the slim chance that there will need to be further changes made).

=== modified file 'cidirector/cidirector.py'
--- cidirector/cidirector.py	2017-02-02 17:51:07 +0000
+++ cidirector/cidirector.py	2017-08-02 04:40:08 +0000
@@ -126,12 +126,12 @@
     def get_building_jobs(self):
         """List all jobs which are currently building."""
         return [j['name'] for j in self.info['jobs']
-                if j['color'].endswith('_anime')]
+                if j.get('color', '').endswith('_anime')]
 
     def get_enabled_jobs(self):
         """List all jobs which are enabled on this Jenkins instance."""
         return [j['name'] for j in self.info['jobs']
-                if not j['color'] == 'disabled']
+                if not j.get('color', '') == 'disabled']
 
 
 class JobInfo:

=== modified file 'cidirector/tests/test_cidirector.py'
--- cidirector/tests/test_cidirector.py	2017-01-31 21:24:22 +0000
+++ cidirector/tests/test_cidirector.py	2017-08-02 04:40:08 +0000
@@ -81,7 +81,8 @@
             yield new_home
 
 
-def make_server_info(phase, buildable=None, building=None, disabled=None):
+def make_server_info(
+        phase, buildable=None, building=None, disabled=None):
     if building is None:
         building = []
     if disabled is None:
@@ -1234,6 +1235,16 @@
             disabled=['qux'])
         self.assertEqual(si.get_enabled_jobs(), ['foo', 'bar', 'baz'])
 
+    def test_handles_jobs_without_color(self):
+        """Some project types don't have 'color' i.e. multibranch pipeline."""
+        # Multibranch jobs aren't actively monitored by ci-director but must
+        # not confuse ci-director.
+        si = ServerInfo({'jobs': [
+            {'name': 'a'},
+            {'color': 'red_anime', 'name': 'd'},
+        ]})
+        self.assertEqual(['d'], si.get_building_jobs())
+
 
 class TestConfigReader(TestCase):
 

=== modified file 'cidirector/tests/test_update_outcome.py'
--- cidirector/tests/test_update_outcome.py	2017-01-18 20:29:38 +0000
+++ cidirector/tests/test_update_outcome.py	2017-08-02 04:40:08 +0000
@@ -36,6 +36,7 @@
     OutcomeJobSource,
     OutcomeState,
     scan_new_builds,
+    update_job_configs,
     )
 from cidirector.utility import temp_dir
 from cidirector.tests.test_cidirector import (
@@ -933,3 +934,21 @@
             state.write_mongo_data(32, rb_data, lbs_data, {})
             mongo_name = state.mongo_filename(32)
             self.assertFalse(os.path.lexists(mongo_name))
+
+
+class TestUpdateJobConfigs(TestCase):
+
+    def test_ignores_multibranch_jobs(self):
+        jobs_by_name = {'my-multibranch': {}}
+        update_job_configs(jobs_by_name, {})
+
+    def test_ignores_only_multibranch(self):
+        jobs_by_name = {
+            'my-multibranch': {},
+            'normal-job': {'name': 'normal-job', 'color': 'not-disabled'}
+            }
+        builds_by_key = {'normal-job': {'normal-job': {}}}
+        update_job_configs(jobs_by_name, builds_by_key)
+        self.assertEqual(
+            builds_by_key,
+            {'normal-job': {'normal-job': {'config': None}}})

=== modified file 'cidirector/update_outcome.py'
--- cidirector/update_outcome.py	2017-01-18 20:20:30 +0000
+++ cidirector/update_outcome.py	2017-08-02 04:40:08 +0000
@@ -124,11 +124,16 @@
 
 def update_job_configs(jobs_by_name, builds_by_key):
     # Ensure config data is provided even for jobs with no builds.
+    # Multibranch jobs don't have a 'color' and ci-director needs to ignore
+    # them at any rate.
     active_jobs = set(n for n, j in jobs_by_name.items()
-                      if j['color'] != 'disabled')
+                      if j.get('color', 'disabled') != 'disabled')
     configs = {}
     active_jobs = set()
     for job_name, job_info in jobs_by_name.items():
+        if not job_info.get('color'):
+            # This is a multibranch job, skip it.
+            continue
         if job_info['color'] != 'disabled':
             active_jobs.add(job_name)
         config = get_cid_config(job_info, cloud_health=True)