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

[Ryan Beisner]

update mappings, adjust base name logic in branch scanner

[Ryan Beisner (1chb1n)]

review: Approve

=== modified file 'populate/mappings.yaml'
--- populate/mappings.yaml	2014-10-02 15:18:00 +0000
+++ populate/mappings.yaml	2014-10-02 16:56:57 +0000
@@ -55,7 +55,7 @@
   - lp:~openstack-charmers/charms/trusty/quantum-gateway/next
   - lp:~openstack-charmers/charms/trusty/swift-proxy/next
   - lp:~openstack-charmers/charms/trusty/swift-storage/next
-  - lp:~uosci/ubuntu-openstack-ci/trunk/
+  - lp:~uosci/ubuntu-openstack-ci/trunk
   - lp:~openstack-charmers/+junk/openstack-charm-testing
 
 # in relation to openstack-charm-testing branch

=== modified file 'scan_branches.py'
--- scan_branches.py	2014-10-02 15:18:00 +0000
+++ scan_branches.py	2014-10-02 16:56:57 +0000
@@ -215,6 +215,11 @@
     return contexts
 
 
+def strip_chars(str):
+    '''Strip characters from string'''
+    return str.translate(None,'+~/\\')
+
+
 def create_properties_dict(changed):
     '''Generate properties data for non-charm, which can be
     passed to a make lint-properties, unit-properties files
@@ -227,8 +232,9 @@
             _base_name = _branch_str.split('/')[-2]
             _display_name = '{}-next'.format(_base_name)
         else:
-            _base_name = _branch_str.split('/')[-1]
+            _base_name = strip_chars('-'.join(_branch_str.split('/')[-2:]))
             _display_name = _base_name
+            _base_name.translate(None,'+~')
 
         contexts.append({
             'branch': _branch_str,