Merge lp:~1chb1n/ubuntu-openstack-ci/ubuntu-openstack-ci-mp-initial into lp:ubuntu-openstack-ci

[Ryan Beisner]

adjust mp scanner logic, update readme

[Ryan Beisner (1chb1n)]

Go

review: Approve

=== modified file 'README'
--- README	2014-10-03 14:43:06 +0000
+++ README	2014-10-09 04:50:00 +0000
@@ -42,6 +42,11 @@
     and deploy from a local branch of the charm specified in the deployer
     bundle yaml, as the jenkins repo seems to have some bad days.
 
+  * For the launchpad librarian python routines to authenticate, you should
+    manually create the OAUTH file and place it in
+    /var/lib/jenkins/.config/tarmac/credentials on the jenkins master.  The
+    merge proposal scanner and tarmac require it.
+
 Jenkins Infrastructure Deployment:
       ./deploy.py
       cd deployment

=== modified file 'populate/amulet-properties.tmpl'
--- populate/amulet-properties.tmpl	2014-10-08 21:15:20 +0000
+++ populate/amulet-properties.tmpl	2014-10-09 04:50:00 +0000
@@ -4,4 +4,3 @@
 MP_TRIGGER={{mp_web}}
 MP_SRC_BR={{mp_src_br}}
 MP_TGT_BR={{mp_tgt_br}}
-

=== modified file 'populate/deploy-properties.tmpl'
--- populate/deploy-properties.tmpl	2014-10-08 21:15:20 +0000
+++ populate/deploy-properties.tmpl	2014-10-09 04:50:00 +0000
@@ -2,7 +2,7 @@
 UBUNTU_RELEASE={{u_rls}}
 OPENSTACK_RELEASE={{os_rls}}
 INSTALLATION_SOURCE={{inst_src}}
+DISPLAY_NAME={{display_name}}
 MP_TRIGGER={{mp_web}}
 MP_SRC_BR={{mp_src_br}}
 MP_TGT_BR={{mp_tgt_br}}
-

=== modified file 'scan_merge_props.py'
--- scan_merge_props.py	2014-10-08 21:15:20 +0000
+++ scan_merge_props.py	2014-10-09 04:50:00 +0000
@@ -95,23 +95,23 @@
         conf_map['misc-conf']['state-dir'],
         '{}.changed'.format(conf_map['misc-conf']['mp-state-file']))
 
-    if len(comps['added']) != 0:
-        logging.debug('added: \n{}'.format(yaml.dump(comps['added'],
+    if len(comps['added']) > 0:
+        logging.info('added: \n{}'.format(yaml.dump(comps['added'],
                                            default_flow_style=False)))
-    if len(comps['rmvd']) != 0:
-        logging.debug('removed: \n{}'.format(yaml.dump(comps['rmvd'],
-                                             default_flow_style=False)))
-    if len(comps['diff']) != 0:
-        logging.debug('changed: \n{}'.format(yaml.dump(comps['diff'],
-                                             default_flow_style=False)))
-    if len(comps['same']) != 0:
-        logging.debug('same: \n{}'.format(yaml.dump(comps['same'],
+    if len(comps['diff']) > 0:
+        logging.info('changed: \n{}'.format(yaml.dump(comps['diff'],
+                                             default_flow_style=False)))
+    if len(comps['same']) > 0:
+        logging.debug('unchanged: \n{}'.format(yaml.dump(comps['same'],
                                           default_flow_style=False)))
+    if len(comps['rmvd']) > 0:
+        logging.info('removed: \n{}'.format(yaml.dump(comps['rmvd'],
+                                             default_flow_style=False)))
+    if len(changed) > 0:
+        logging.debug('added or changed: \n{}'.format(
+            yaml.dump(changed, default_flow_style=False)))
 
     if len(changed) > 0 or len(comps['rmvd']) > 0:
-        # changes detected
-        logging.info('added or changed: \n{}'.format(
-            yaml.dump(changed, default_flow_style=False)))
         # Write current branch state to file
         osci_utils.write_yaml(state, mp_state_fn)
         # Also write flat file containing new or changed branches