Merge lp:~1chb1n/ubuntu-openstack-ci/mojo-runner-enhance into lp:ubuntu-openstack-ci

[Ryan Beisner]

Refactor branch_scanner tools
Fix make_exec.py to adhere to make target order in makefiles
Add mojo_trigger_groups.py tool
Add the notion of HOT U:OS combos
Improve launchpad comment subject with PASS/FAIL
Resolve multiple mojo runner issues

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7580 lp:ubuntu-openstack-ci for 1chb1n mp265726
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7580/

[lp:~1chb1n/ubuntu-openstack-ci/mojo-runner-enhance]

197. By Ryan Beisner on 2015-08-05

fix mp scanner for non-charms

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7581 lp:ubuntu-openstack-ci for 1chb1n mp265726
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7581/

[lp:~1chb1n/ubuntu-openstack-ci/mojo-runner-enhance]

198. By Ryan Beisner on 2015-08-07

update mappings for object storage specs

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7647 lp:ubuntu-openstack-ci for 1chb1n mp265726
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7647/

[lp:~1chb1n/ubuntu-openstack-ci/mojo-runner-enhance]

199. By Ryan Beisner on 2015-08-10

re-enable stable charm triggers

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7766 lp:ubuntu-openstack-ci for 1chb1n mp265726
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7766/

[lp:~1chb1n/ubuntu-openstack-ci/mojo-runner-enhance]

200. By Ryan Beisner on 2015-08-11

update deploy trigger

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7866 lp:ubuntu-openstack-ci for 1chb1n mp265726
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7866/

[lp:~1chb1n/ubuntu-openstack-ci/mojo-runner-enhance]

201. By Ryan Beisner on 2015-08-12

add mojo to package version dump

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7933 lp:ubuntu-openstack-ci for 1chb1n mp265726
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7933/

[lp:~1chb1n/ubuntu-openstack-ci/mojo-runner-enhance]

202. By Ryan Beisner on 2015-08-28

improve launchpad comment subject detail

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #8936 lp:ubuntu-openstack-ci for 1chb1n mp265726
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/8936/

=== modified file 'Makefile'
--- Makefile	2014-10-28 14:37:55 +0000
+++ Makefile	2015-08-28 16:23:16 +0000
@@ -8,7 +8,3 @@
 pylint:
 	@echo "Running pylint tests: "
 	@pylint -rn *.py deployment/*.py populate/*.py admin/*.py common/*.py
-
-unit_test:
-	@echo "Starting unit tests (none here yet):"
-	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage

=== modified file 'README'
--- README	2014-11-22 16:16:10 +0000
+++ README	2015-08-28 16:23:16 +0000
@@ -72,7 +72,9 @@
 
   admin/           misc administrative and debug scripts
   common/          shared code for admin, deployment, ongoing use
+  dev/             work-in-progress or temporary work-arounds, patches, etc.
   populate/        see README.jobs
+  tools/           command line tools used in automation/manual testing
 
 
 Notes:

=== modified file 'common/osci_utils.py'
--- common/osci_utils.py	2015-07-10 21:36:58 +0000
+++ common/osci_utils.py	2015-08-28 16:23:16 +0000
@@ -6,6 +6,7 @@
 import distro_info
 import logging
 import multiprocessing
+import optparse
 import os
 import random
 import paramiko
@@ -13,7 +14,13 @@
 import string
 import subprocess
 import sys
+import tempfile
+import time
+import uuid
 import yaml
+import bzrlib.errors
+from bzrlib import branch
+from bzrlib.plugin import load_plugins
 from jinja2 import Environment, FileSystemLoader
 from launchpadlib.launchpad import Launchpad
 
@@ -21,7 +28,23 @@
 MAP_FILE = 'populate/mappings.yaml'
 LPL_CRED_FN = os.path.expanduser("~") + "/.config/tarmac/credentials"
 
-
+try:
+    WORKSPACE = os.environ['WORKSPACE']
+except KeyError:
+    WORKSPACE = tempfile.mkdtemp()
+
+try:
+    JENV_NAME = os.environ['JENV_NAME']
+except KeyError:
+    JENV_NAME = None
+
+try:
+    BUILD_NUMBER = os.environ['BUILD_NUMBER']
+except KeyError:
+    BUILD_NUMBER = '000'
+
+
+# Helpers
 def rnd_str(length=32):
     '''Return lower-case alpha-numeric random string, a la pwgen.
 
@@ -34,9 +57,28 @@
     return _str
 
 
-def strip_chars(string, strip='+@~/\\'):
-    '''Strip certaing characters from string'''
-    return string.translate(None, strip)
+def fill_dict_with_epoch_time(data):
+    _d = {}
+    for k in data.keys():
+        _d[k] = time.time()
+    return _d
+
+
+def invert_dict_of_lists(d):
+    """Inverts a dictionary of lists."""
+    _inverted = {}
+    for k, v in d.iteritems():
+        for item in v:
+            if item in _inverted.keys():
+                _inverted[item].append(k)
+            else:
+                _inverted[item] = [k]
+    return _inverted
+
+
+def strip_chars(string, chars='+~/\\'):
+    '''Strip characters from string'''
+    return string.translate(None, chars)
 
 
 def touch(file_name):
@@ -103,8 +145,8 @@
             cmd = 'timeout {} juju status --format=yaml'.format(timeout)
         j_stat = yaml.load(subprocess.check_output(cmd.split()))
     except subprocess.CalledProcessError:
-        logging.warning(' ! Juju status attempt returned non-zero, '
-                        'most likely no juju enviro bootstrapped.')
+        logging.info('Juju status attempt returned non-zero, '
+                     'most likely no juju enviro bootstrapped.')
         j_stat = {}
     return j_stat
 
@@ -173,7 +215,7 @@
 
 def get_networks(network, octet, quantity, bits):
     '''Create a list of IPV4 networks in CIDR notation, generated by
-       incrementing a specified octet, the specified number of times.
+    incrementing a specified octet, the specified number of times.
 
     :param network: network string (eg, 192.168.7.0 or 10.200.0.0, non-CIDR)
     :param octet: octet to increment (eg, 1.2.3.4)
@@ -198,33 +240,40 @@
 
 
 def get_os_creds():
-    '''Pull OpenStack credentials from environment variables,
-       return a dictionary for use with various openstack apis.
-       Since there is not consistent credential naming across
-       apis, return multiple types.  Some of them are:
-       Type 0 = neutron, keystone
-       Type 1 = nova
+    '''Pull OpenStack credentials from environment variables, return a
+    dictionary for use with various openstack apis.  Since there is not
+    consistent credential naming across apis, return multiple types.
+    Some of them are:
+    Type 0 = neutron, keystone
+    Type 1 = nova
 
-       :returns: list of dicts containing openstack credentials
+    :returns: list of dicts containing openstack credentials
     '''
     creds = {}
     creds[0] = {}
     creds[1] = {}
-    creds[0]['auth_url'] = os.environ['OS_AUTH_URL']
-    creds[0]['username'] = os.environ['OS_USERNAME']
-    creds[0]['password'] = os.environ['OS_PASSWORD']
-    creds[0]['tenant_name'] = os.environ['OS_TENANT_NAME']
-    creds[0]['region_name'] = os.environ['OS_REGION_NAME']
-    creds[1]['auth_url'] = os.environ['OS_AUTH_URL']
-    creds[1]['username'] = os.environ['OS_USERNAME']
-    creds[1]['api_key'] = os.environ['OS_PASSWORD']
-    creds[1]['project_id'] = os.environ['OS_TENANT_NAME']
+    creds[0]['auth_url'] = os.getenv('OS_AUTH_URL')
+    creds[0]['username'] = os.getenv('OS_USERNAME')
+    creds[0]['password'] = os.getenv('OS_PASSWORD')
+    creds[0]['tenant_name'] = os.getenv('OS_TENANT_NAME')
+    creds[0]['region_name'] = os.getenv('OS_REGION_NAME')
+    creds[1]['auth_url'] = os.getenv('OS_AUTH_URL')
+    creds[1]['username'] = os.getenv('OS_USERNAME')
+    creds[1]['api_key'] = os.getenv('OS_PASSWORD')
+    creds[1]['project_id'] = os.getenv('OS_TENANT_NAME')
+
+    validate = list(set(creds[0].values() + creds[1].values()))
+
+    if not validate[0]:
+        logging.warn('OpenStack credential environment variables not found.')
+        creds = {}
+
     return creds
 
 
 def floating_ip_is_available(neutron):
     '''Check if a floating ip is available to the tenant, using the
-       provided neutron client object.
+    provided neutron client object.
 
     :param neutron: neutron client object
     :returns: True if a floating IP is available to the tenant
@@ -240,7 +289,7 @@
 
 def has_floating_ip(addresses, fip_str):
     '''Inspect list of addresses for an item which starts with the specified
-       string.  Returns the (first) matching item found, returns None if not.
+    string.  Returns the (first) matching item found, returns None if not.
 
     :param addresses: list of dicts containing nova addresses data
     :param fip_str: floating IP string to match, generally first 2 or 3 octets
@@ -265,15 +314,15 @@
         return False
 
 
-def replace_line_with_lines(filename, str_find, with_lines):
+def replace_line_with_lines(file_name, str_find, with_lines):
     '''Inject lines into file, where string is found in exactly and
        only one line.  Return None if successful, return a message otherwise.
 
-    :param filename: file name as string, to read and write
+    :param file_name: file name as string, to read and write
     :param str_find: string to find in a line
     :param str_lines: list of lines to inject
     '''
-    with open(filename, 'r') as r_file:
+    with open(file_name, 'r') as r_file:
         lines = r_file.readlines()
 
     indices = []
@@ -283,10 +332,10 @@
     if len(indices) > 1:
         return 'Could not replace line, found more than one match.'
     elif len(indices) == 0:
-        return 'Could not replace line, no match in {}'.format(filename)
+        return 'Could not replace line, no match in {}'.format(file_name)
     elif len(indices) == 1:
         logging.info('string find for {}: {}'.format(str_find, indices))
-        with open(filename, 'w') as w_file:
+        with open(file_name, 'w') as w_file:
             out_lines = (lines[0:indices[0]] +
                          with_lines +
                          lines[indices[0] + 1:])
@@ -295,7 +344,7 @@
 
 def openstack_release(ubuntu_release):
     '''Return the OpenStack release version shipped with a particular
-       release of Ubuntu.
+    release of Ubuntu.
 
     :param ubuntu_release: Ubuntu release codename (eg, utopic)
     :returns: OpenStack release name as string
@@ -312,7 +361,7 @@
 
 def uca_openstack_releases(ubuntu_release):
     '''Return a list of OpenStack releases available to particular release
-       of Ubuntu via cloud archives aka UCA.
+    of Ubuntu via cloud archives aka UCA.
 
     :param ubuntu_release: Ubuntu release codename (eg, utopic)
     :returns: OpenStack release names as list
@@ -349,9 +398,9 @@
 
 
 def dict_compare(dict_old, dict_new):
-    '''Compare two dictionaries, return dict of list of keys which
-       have been added, removed, have had their values changed, or
-       have the same values.
+    '''Compare two dictionaries, return dict of lists containing the
+    original keys which have been added, removed, have changed values,
+    or have the same values.
     '''
     dict_new_keys = frozenset(dict_new.keys())
     dict_old_keys = frozenset(dict_old.keys())
@@ -362,6 +411,19 @@
     _d['diff'] = list(k for k in intersect_keys if dict_new[k] != dict_old[k])
     _d['same'] = list(k for k in intersect_keys if dict_new[k] == dict_old[k])
     _d['diff-rmvd'] = list(set(_d['diff']) - set(_d['rmvd']))
+    _d['changed'] = list(set(_d['added'] + _d['diff'] + _d['rmvd']))
+
+    if _d['added']:
+        logging.debug('Added: \n{}'.format(dict_to_yaml(_d['added'])))
+
+    if _d['rmvd']:
+        logging.debug('Removed: \n{}'.format(dict_to_yaml(_d['rmvd'])))
+
+    if _d['diff']:
+        logging.debug('Diff: \n{}'.format(dict_to_yaml(_d['diff'])))
+
+    if _d['same']:
+        logging.debug('Same: \n{}'.format(dict_to_yaml(_d['same'])))
     return _d
 
 
@@ -393,6 +455,7 @@
         _file.write(template.render(context))
 
 
+# Launchpad helpers
 def lpl_connect(anonymous=False):
     '''Connect to launchpad, return a Launchpad object.
     '''
@@ -468,7 +531,7 @@
 
 
 def pb_it(file_name):
-    '''pastebin a filename, return pastebin url
+    '''pastebin a file_name, return pastebin url
     '''
     if os.path.isfile(file_name):
         pb_url = subprocess.Popen(['pastebinit', file_name],
@@ -568,13 +631,13 @@
         logging.debug('SSH stdout: {}'.format(stdout_lines))
         logging.debug('SSH stderr: {}'.format(stderr_lines))
     except paramiko.ssh_exception.SSHException, e:
-        logging.debug('SSH session connect FAILED for host '
+        logging.error('SSH session connect FAILED for host '
                       '{} ({})'.format(host, e))
         if mpq:
             mpq.put(False)
         return False
     except socket.error, e:
-        logging.debug('SSH socket connect FAIL for'
+        logging.error('SSH socket connect FAIL for'
                       ' {} ({})'.format(host, e))
         if mpq:
             mpq.put(False)
@@ -640,3 +703,389 @@
         _queue_return = _queue.get()
         logging.debug('func_timeout OK.  Queue: {}'.format(_queue_return))
         return _queue_return
+
+
+# branch scanner helpers
+def dict_to_yaml(dict_data):
+    return yaml.dump(dict_data, default_flow_style=False)
+
+
+def create_properties_files(contexts, source, out_file,
+                            templates_dir='populate'):
+    '''Create properties files for targets defined in contexts dict.'''
+    for idx, context in enumerate(contexts):
+        if 'mojo_spec' in context.keys() and 'metal' in context['mojo_spec']:
+            _file = 'baremetal-{}'.format(out_file)
+        else:
+            _file = out_file
+
+        target = os.path.join(WORKSPACE, _file.format(uuid.uuid4()))
+        logging.debug('Rendering properties file: {}'.format(target))
+        render(source, target, context, templates_dir)
+    logging.info('Created {} properties files.'.format(len(contexts)))
+
+
+def is_charm_branch(branch_str):
+    '''Return true if the branch string looks like a charm.'''
+    if '/charms/' in branch_str or 'lp:charms/' in branch_str:
+        logging.debug(' + Looks like a charm: {}'.format(branch_str))
+        return True
+    else:
+        logging.debug(' - Does not look like a charm: {}'.format(branch_str))
+        return False
+
+
+def is_next_branch(branch_str):
+    '''Return True if the branch string looks like a next charm.'''
+    if branch_str[-5:] == "/next" in branch_str:
+        logging.debug(' + Looks like a next branch: {}'.format(branch_str))
+        return True
+    else:
+        logging.debug(' - Does not look like a next branch: '
+                      '{}'.format(branch_str))
+        return False
+
+
+def get_tags(branch_str):
+    '''Return a list of hash tags in a string.'''
+    if '#' in branch_str:
+        return branch_str.split('#')[1:]
+    else:
+        return None
+
+
+def strip_tags(branch_str):
+    '''Return a string without hash tags.'''
+    if '#' in branch_str:
+        return branch_str.split('#')[0]
+    else:
+        return branch_str
+
+
+def dict_strip_tags(dict_data):
+    '''Remove tags from keys in a dictionary.'''
+    _d = {}
+    for k, v in dict_data:
+        _d[strip_tags(k)] = v
+    return _d
+
+
+def list_strip_tags(list_data):
+    '''Remove tags from values in a list of strings.'''
+    _list = []
+    for v in list_data:
+        _list.append(strip_tags(v))
+    return _list
+
+
+def is_tagged(my_string, tagged, tags):
+    '''Check if a string contains any of a list of tags, based on
+    a dict of tags to branch strings.
+    '''
+    for tag in tags:
+        if my_string in tagged[tag]:
+            logging.info('Tag: {} on {}'.format(tag, my_string))
+            return True
+    return False
+
+
+def get_tagged_branches(conf_map):
+    '''Get tagged branches from config map data.  Return a dict of
+    tag keys and branch values.
+    '''
+    # Available tags
+    tagged = {
+        'NOAMULET': [],
+        'NODEPLOY': [],
+        'NOLINT': [],
+        'NOUNIT': [],
+    }
+
+    for branch_str in conf_map['trigger-branches']:
+        tags = get_tags(branch_str)
+        if not tags:
+            continue
+        for tag in tags:
+            if tag not in tagged.keys():
+                raise ValueError('Invalid tag: {}.  Valid tags '
+                                 'are: {}'.format(tag, tagged.keys()))
+            tagged[tag].append(strip_tags(branch_str))
+
+    logging.debug('Tagged: \n{}'.format(dict_to_yaml(tagged)))
+    return tagged
+
+
+def get_next_base_name(branch_str):
+    '''Return charm name, given a next branch string.'''
+    return branch_str.split('/')[-2]
+
+
+def get_stable_base_name(branch_str):
+    '''Return charm name, given a non-next branch string.'''
+    return strip_chars('-'.join(branch_str.split('/')[-1:]))
+
+
+def create_properties_dict(changed, tagged={},
+                           blacktags=[], charms_only=False):
+    '''Generate properties data which can be passed to a make lint-
+    properties, unit-properties, amulet-properties files, routines, etc.
+    for consumption by Jenkins parameterized jobs.  Accepts dict of tagged
+    branches and a list of blacklistedm, to skip matches.  Optionally
+    create properties only for charm branches.
+    '''
+    contexts = []
+    changed.sort()
+    for branch_str in changed:
+
+        # Skip branches tagged with blacktags
+        if is_tagged(branch_str, tagged, blacktags):
+            continue
+
+        is_charm = is_charm_branch(branch_str)
+        is_next = is_next_branch(branch_str)
+
+        if is_charm and is_next:
+            base_name = get_next_base_name(branch_str)
+            display_name = '{}-next'.format(base_name)
+        else:
+            base_name = get_stable_base_name(branch_str)
+            display_name = base_name
+
+        if (is_charm and charms_only) or not charms_only:
+            contexts.append({
+                'branch': branch_str,
+                'base_name': base_name,
+                'display_name': display_name
+            })
+    return contexts
+
+
+def create_deploy_properties_dict(deploy_group):
+    '''Generate template context data for deploy targets in a provided dict.
+    Return a dictionary which can be passed to a make deploy-properties
+    files routine.
+    '''
+    rls_supp = get_u_supported()
+    contexts = []
+    for charm_set, targets in deploy_group.iteritems():
+        targets.sort(reverse=True)
+        for target in targets:
+            target_split = target.split('-')
+            u_rls = target_split[0]
+            os_rls = target_split[1]
+
+            if len(target_split) == 3:
+                inst_src = target_split[2]
+
+            elif len(target_split) == 2:
+                inst_src = 'default'
+            else:
+                raise ValueError('Invalid target name: {}'.format(target))
+
+            if u_rls not in rls_supp:
+                logging.warn('Detected an unsupported '
+                             'release: {}'.format(u_rls))
+
+            contexts.append({
+                'charm_set': charm_set,
+                'u_rls': u_rls,
+                'os_rls': os_rls,
+                'inst_src': inst_src
+            })
+    return contexts
+
+
+def get_state_file_name(conf_map, key='state-file'):
+    '''Get branch scanner state file name based on config data.'''
+    safe_mkdir(conf_map['misc-conf']['state-dir'])
+    state_fn = os.path.join(conf_map['misc-conf']['state-dir'],
+                            conf_map['misc-conf'][key])
+
+    logging.info('State file: {}'.format(state_fn))
+    return state_fn
+
+
+def read_state_file(state_fn):
+    '''Read state data from state file.'''
+    logging.debug('Reading state data from: {}'.format(state_fn))
+    if os.path.isfile(state_fn):
+        state_prev = read_yaml(state_fn)
+    else:
+        state_prev = {}
+    return state_prev
+
+
+def write_state_file(state_data, state_fn):
+    '''Commit state data to the state file.'''
+    logging.debug('Writing state data to: {}'.format(state_fn))
+    write_yaml(state_data, state_fn)
+
+
+def write_changed_file(changed_data, changed_fn):
+    '''Write a flat file containing new or changed branch strings.'''
+    logging.debug('Writing added/changed info to: {}'.format(changed_fn))
+    with open(changed_fn, 'w') as w_file:
+        w_file.write('\n'.join(changed_data))
+
+
+def fake_branch_states(branch_list):
+    '''Construct a dict with branch strings as keys, and epoch time as
+    values.  Useful for forcing all to appear to be changed.
+    '''
+    state_fake = {}
+    for branch_str in list_strip_tags(branch_list):
+        logging.info('Forcing simulated change on:  {}'.format(branch_str))
+        state_fake[branch_str] = time.time()
+    return state_fake
+
+
+def query_branch_states(branch_list, max_tries=10):
+    '''Get current state of a list of launchpad branches, return a dict.'''
+    load_plugins()
+    state_now = {}
+    for branch_str in list_strip_tags(branch_list):
+        logging.info('Querying revision info on:  {}'.format(branch_str))
+        ret_ok, tries = False, 0
+
+        # Check branches and handle bazaar http retries
+        while not ret_ok and tries <= max_tries:
+            try:
+                this_br = branch.Branch.open(branch_str)
+                ret_ok = True
+            except bzrlib.errors.InvalidHttpResponse as exception:
+                logging.debug('HTTP error checking {} on attempt {} of '
+                              '{}'.format(branch_str, tries, max_tries))
+                logging.error('{} {}'.format(exception.path, exception.msg))
+                time.sleep(3)
+            tries += 1
+
+        if not ret_ok:
+            raise ValueError('Query failed on:  {}'.format(branch_str))
+
+        state_now[branch_str] = list(this_br.last_revision_info())
+
+    return state_now
+
+
+def is_deploy_needed(changed, tagged={}, blacktags=[]):
+    '''Analyze strings of changed branches to determine if any next
+    or stable charms have changed, while excluding those blacklisted
+    with a tag.'''
+
+    if not changed:
+        return False
+
+    deploy_stable, deploy_next = False, False
+    for branch_str in changed:
+
+        # Skip branches tagged with blacktags
+        if is_tagged(branch_str, tagged, blacktags):
+            continue
+
+        is_charm = is_charm_branch(branch_str)
+        is_next = is_next_branch(branch_str)
+
+        if is_charm and is_next:
+            deploy_next = True
+        elif is_charm and not is_next:
+            deploy_stable = True
+
+#   TODO - trigger next and stable independently
+#   For now, a change in either with trigger both.
+#    logging.info('Deploy stable: {}'.format(deploy_stable))
+#    logging.info('Deploy next: {}'.format(deploy_next))
+#    return deploy_next, deploy_stable
+
+    logging.info('Deploy: {}'.format(deploy_stable or deploy_next))
+
+    if deploy_next or deploy_stable:
+        return True
+    else:
+        return False
+
+
+def define_scanner_command_options(USAGE):
+    '''Define command line options.'''
+    parser = optparse.OptionParser(USAGE)
+    parser.add_option("-d", "--debug",
+                      help="Enable debug logging",
+                      dest="debug", action="store_true", default=False)
+    parser.add_option('--XA', '--no-amulet-trigger',
+                      help='Do not create amulet job properties files.',
+                      dest='amulet', action='store_false', default=True)
+    parser.add_option('--XD', '--no-deploy-trigger',
+                      help='Do not create deploy job properties files.',
+                      dest='deploy', action='store_false', default=True)
+    parser.add_option('--XL', '--no-lint-trigger',
+                      help='Do not create lint job properties files.',
+                      dest='lint', action='store_false', default=True)
+    parser.add_option('--XU', '--no-unit-trigger',
+                      help='Do not create unit test job properties files.',
+                      dest='unit', action='store_false', default=True)
+    parser.add_option('-F', '--force-changed',
+                      help='Do not check branches, act like ALL were changed '
+                           'regardless of actual state.  Default False.',
+                      dest='force', action='store_true', default=False)
+    parser.add_option('-X', '--no-scan',
+                      help='Do not check branches, act like NONE were changed '
+                           'regardless of actual state.  Default False.',
+                      dest='no_scan', action='store_true', default=False)
+    parser.add_option('-N', '--no-state',
+                      help='Do not update state file.  Has no effect if '
+                           'used in combination with dry run.',
+                      dest='no_state', action='store_true', default=False)
+    parser.add_option('-0', '--dry-run',
+                      help='Do not create properties files, and do not '
+                           'update state file(s).',
+                      dest='dry', action='store_true', default=False)
+
+    return parser.parse_args()
+
+
+def handle_scanner_command_options(opts, args):
+    '''Handle command options and inform user.'''
+    if opts.debug:
+        logging.basicConfig(level=logging.DEBUG)
+        logging.info('Logging level set to DEBUG!')
+        logging.debug('parse opts: \n{}'.format(dict_to_yaml(vars(opts))))
+        logging.debug('parse args: {}'.format(args))
+    else:
+        logging.basicConfig(level=logging.INFO)
+
+    logging.info('Workspace dir: {}'.format(WORKSPACE))
+
+    if opts.force:
+        logging.info(' - Branch scanning disabled.  Will force state to '
+                     'CHANGED for all monitored branches!')
+    else:
+        logging.info(' + Branch scanning enabled.')
+
+    if opts.amulet:
+        logging.info(' + Amulet trigger creation enabled.')
+    else:
+        logging.info(' - Amulet trigger creation disabled.')
+
+    if opts.unit:
+        logging.info(' + Unit test trigger creation enabled.')
+    else:
+        logging.info(' - Unit test trigger creation disabled.')
+
+    if opts.lint:
+        logging.info(' + Lint trigger creation enabled.')
+    else:
+        logging.info(' - Lint trigger creation disabled.')
+
+    if opts.deploy:
+        logging.info(' + Deploy trigger creation enabled.')
+    else:
+        logging.info(' - Deploy trigger creation disabled.')
+
+    if opts.no_state:
+        logging.info(' - No-Update enabled, state files will not be updated.')
+
+    if opts.dry:
+        logging.info(' - Dry run enabled, properties files and state files '
+                     'will not be created/updated.')
+
+    if opts.no_scan and opts.force:
+        logging.warn('Specifying Force and No Scan makes no sense.  YMMV')

=== renamed file 'prep.sh' => 'deploy-prep.sh'
=== renamed file 'deploy.py' => 'deploy-uosci.py'
--- deploy.py	2015-01-27 16:29:47 +0000
+++ deploy-uosci.py	2015-08-28 16:23:16 +0000
@@ -1,13 +1,13 @@
 #!/usr/bin/python
 '''
   Deploys/creates (or updates) jenkins environment, neutron networks, etc.
-  See README(s)!  This is NOT to be incorporated into jenkins jobs/tests.
+  See README(s)!  This is not incorporated into jenkins jobs/tests.
 '''
+import logging
 import os
-import yaml
 import subprocess
-import logging
 import uuid
+import yaml
 from copy import deepcopy
 from netaddr import IPNetwork
 from neutronclient.neutron import client as ne_client

=== removed directory 'deployment/jobs/X_manual_trigger_deploy_openstack'
=== removed file 'deployment/jobs/X_manual_trigger_deploy_openstack/config.xml'
--- deployment/jobs/X_manual_trigger_deploy_openstack/config.xml	2015-02-05 22:19:52 +0000
+++ deployment/jobs/X_manual_trigger_deploy_openstack/config.xml	1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description>THIS TRIGGER IS EXPERIMENTAL AND IN DEVELOPMENT&#xd;
-BEST NOT USE IT JUST YET&#xd;
-&#xd;
-* Manually trigger a deployment with the chosen parameters.&#xd;
-* Calls deploy_with_deployer.</description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>UBUNTU_RELEASE</name>
-          <description>THIS TRIGGER IS EXPERIMENTAL AND IN DEVELOPMENT
-BEST NOT USE IT JUST YET</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>vivid</string>
-              <string>utopic</string>
-              <string>trusty</string>
-              <string>precise</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>OPENSTACK_RELEASE</name>
-          <description>THIS TRIGGER IS EXPERIMENTAL AND IN DEVELOPMENT
-BEST NOT USE IT JUST YET</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>kilo</string>
-              <string>juno</string>
-              <string>icehouse</string>
-              <string>havana</string>
-              <string>grizzly</string>
-              <string>folsom</string>
-              <string>essex</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>INSTALLATION_SOURCE</name>
-          <description>THIS TRIGGER IS EXPERIMENTAL AND IN DEVELOPMENT
-BEST NOT USE IT JUST YET</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>default</string>
-              <string>proposed</string>
-              <string>staging</string>
-              <string>trunk</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>CHARM_SET</name>
-          <description>Choose a pre-defined deployer bundle yaml from O-C-T branch,
-or choose &quot;custom-other.yaml&quot; and upload an arbitrary deployer file to use it.
-Custom bundle should have the same targets as the default and next yamls.</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>default.yaml</string>
-              <string>next.yaml</string>
-              <string>default-baremetal.yaml</string>
-              <string>next-baremetal.yaml</string>
-              <string>next-power8.yaml</string>
-              <string>default-power8.yaml</string>
-              <string>custom-other.yaml</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-        <hudson.model.FileParameterDefinition>
-          <name>custom-other.yaml</name>
-          <description></description>
-        </hudson.model.FileParameterDefinition>
-        <hudson.model.BooleanParameterDefinition>
-          <name>TEMPEST_SMOKE</name>
-          <description>Enable to run tempest smoke tests after deployment.  Keep on by default.</description>
-          <defaultValue>true</defaultValue>
-        </hudson.model.BooleanParameterDefinition>
-        <hudson.model.BooleanParameterDefinition>
-          <name>NO_POST_DESTROY</name>
-          <description>Set true to skip destroy after deployment.  Note that the enviro will most likely be torn down by the next job!</description>
-          <defaultValue>false</defaultValue>
-        </hudson.model.BooleanParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>JUJU_SOURCE</name>
-          <description>Source for juju packages (stable, devel or proposed).</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>ppa:juju/stable</string>
-              <string>ppa:juju/devel</string>
-              <string>ppa:juju/proposed</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>LAB</name>
-          <description>/!\ CAUTION:  LAB is a Work In Progress /!\
-Where:
-  serverstack:  deploys on OpenStack
-  dellstack:  deploys on AMD64 baremetal via MAAS
-  dellstack-power:  deploys on PPC64el Power8 via MAAS
-
-Must choose an appropriate CHARM_SET (bundle).  Not all bundles will work in all labs.
-
-THIS TRIGGER IS EXPERIMENTAL AND IN DEVELOPMENT
-BEST NOT USE IT JUST YET</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>serverstack</string>
-              <string>dellstack</string>
-              <string>dellstack-power</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
-      <autoRebuild>false</autoRebuild>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <throttleEnabled>true</throttleEnabled>
-      <throttleOption>project</throttleOption>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
-  </properties>
-  <scm class="hudson.scm.NullSCM"/>
-  <canRoam>true</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers/>
-  <concurrentBuild>true</concurrentBuild>
-  <builders>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
-      <configs>
-        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-          <configs>
-            <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
-          </configs>
-          <projects>openstack_lab_switcher</projects>
-          <condition>ALWAYS</condition>
-          <triggerWithNoParameters>false</triggerWithNoParameters>
-          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
-        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-      </configs>
-    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
-  </builders>
-  <publishers>
-    <hudson.tasks.ArtifactArchiver>
-      <artifacts>*</artifacts>
-      <allowEmptyArchive>true</allowEmptyArchive>
-      <onlyIfSuccessful>false</onlyIfSuccessful>
-      <fingerprint>false</fingerprint>
-      <defaultExcludes>true</defaultExcludes>
-    </hudson.tasks.ArtifactArchiver>
-  </publishers>
-  <buildWrappers>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>#${BUILD_NUMBER} ${ENV,var=&quot;OPENSTACK_RELEASE&quot;} from ${ENV,var=&quot;INSTALLATION_SOURCE&quot;} on ${ENV,var=&quot;UBUNTU_RELEASE&quot;} via ${ENV,var=&quot;CHARM_SET&quot;}</template>
-    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
-  </buildWrappers>
-</project>
\ No newline at end of file

=== modified file 'deployment/jobs/charm_amulet_test/config.xml'
--- deployment/jobs/charm_amulet_test/config.xml	2015-07-09 21:17:57 +0000
+++ deployment/jobs/charm_amulet_test/config.xml	2015-08-28 16:23:16 +0000
@@ -5,10 +5,10 @@
 * Use a trigger to hit this job with parameters.&#xd;
 * Not intended to be run manually.</description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>500</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -66,7 +66,7 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>7</maxConcurrentTotal>
+      <maxConcurrentTotal>3</maxConcurrentTotal>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>

=== modified file 'deployment/jobs/charm_lint_check/config.xml'
--- deployment/jobs/charm_lint_check/config.xml	2015-01-21 05:51:34 +0000
+++ deployment/jobs/charm_lint_check/config.xml	2015-08-28 16:23:16 +0000
@@ -5,10 +5,10 @@
 * Use a trigger to hit this job with parameters.&#xd;
 * Not intended to be run manually.</description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>180</daysToKeep>
-    <numToKeep>500</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -51,7 +51,7 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>8</maxConcurrentTotal>
+      <maxConcurrentTotal>12</maxConcurrentTotal>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
@@ -80,14 +80,14 @@
       <fingerprint>false</fingerprint>
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
-    <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.9">
+    <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
       <regexp>_:.*</regexp>
       <regexpForFailed>_:.*</regexpForFailed>
       <setForMatrix>false</setForMatrix>
     </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.15"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>

=== modified file 'deployment/jobs/charm_unit_test/config.xml'
--- deployment/jobs/charm_unit_test/config.xml	2015-01-21 05:51:34 +0000
+++ deployment/jobs/charm_unit_test/config.xml	2015-08-28 16:23:16 +0000
@@ -5,10 +5,10 @@
 * Use a trigger to hit this job with parameters.&#xd;
 * Not intended to be run manually.</description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>180</daysToKeep>
-    <numToKeep>500</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -51,7 +51,7 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>8</maxConcurrentTotal>
+      <maxConcurrentTotal>12</maxConcurrentTotal>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
@@ -79,14 +79,14 @@
       <fingerprint>false</fingerprint>
       <defaultExcludes>true</defaultExcludes>
     </hudson.tasks.ArtifactArchiver>
-    <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.9">
+    <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
       <regexp>_:.*</regexp>
       <regexpForFailed>_:.*</regexpForFailed>
       <setForMatrix>false</setForMatrix>
     </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.15"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>

=== removed directory 'deployment/jobs/deploy_openstack'
=== removed file 'deployment/jobs/deploy_openstack/config.xml'
--- deployment/jobs/deploy_openstack/config.xml	2015-05-17 14:36:21 +0000
+++ deployment/jobs/deploy_openstack/config.xml	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description>* NOT intended to be run manually, although it can be REBUILT.&#xd;
-* Use a trigger to hit this job with parameters.&#xd;
-* Deploys Ubuntu OpenStack from ?.yaml bundle from openstack-charm-testing.&#xd;
-* Job PASSES if the bundle deploys cleanly.&#xd;
-* Other fails such as tempest will not cause job fail.&#xd;
-&#xd;
-</description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>180</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>30</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>UBUNTU_RELEASE</name>
-          <description></description>
-          <defaultValue>utopic</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>OPENSTACK_RELEASE</name>
-          <description></description>
-          <defaultValue>juno</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>INSTALLATION_SOURCE</name>
-          <description></description>
-          <defaultValue>default</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>CHARM_SET</name>
-          <description></description>
-          <defaultValue>next.yaml</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.FileParameterDefinition>
-          <name>custom-other.yaml</name>
-          <description></description>
-        </hudson.model.FileParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>DISPLAY_NAME</name>
-          <description></description>
-          <defaultValue></defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>MP_TRIGGER</name>
-          <description></description>
-          <defaultValue></defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>MP_SRC_BR</name>
-          <description></description>
-          <defaultValue></defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>MP_TGT_BR</name>
-          <description>REBUILD is ok, but this job NOT intended to be run manually
-See the manual_trigger_deploy_with_deployer job instead if you need to kick off a deployment.
-</description>
-          <defaultValue></defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.BooleanParameterDefinition>
-          <name>TEMPEST_SMOKE</name>
-          <description>Enable to run tempest smoke tests after deployment.  Keep on by default.</description>
-          <defaultValue>true</defaultValue>
-        </hudson.model.BooleanParameterDefinition>
-        <hudson.model.BooleanParameterDefinition>
-          <name>JUJU_SOURCE</name>
-          <description>ppa to use for juju-core</description>
-          <defaultValue>false</defaultValue>
-        </hudson.model.BooleanParameterDefinition>
-        <hudson.model.BooleanParameterDefinition>
-          <name>NO_POST_DESTROY</name>
-          <description>Set true to skip destroy after deployment.  Note that the enviro will most likely be torn down by the next job!</description>
-          <defaultValue>false</defaultValue>
-        </hudson.model.BooleanParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
-      <autoRebuild>false</autoRebuild>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>1</maxConcurrentTotal>
-      <throttleEnabled>true</throttleEnabled>
-      <throttleOption>project</throttleOption>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
-  </properties>
-  <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>x86_64 || slave || trusty-slave</assignedNode>
-  <canRoam>false</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers/>
-  <concurrentBuild>true</concurrentBuild>
-  <builders>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/part_workspace_cleanup.sh</command>
-    </hudson.tasks.Shell>
-    <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.35">
-      <project>manual_trigger_deploy_with_deployer</project>
-      <filter>custom-other.yaml</filter>
-      <target></target>
-      <excludes></excludes>
-      <selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
-      <optional>true</optional>
-      <doNotFingerprintArtifacts>false</doNotFingerprintArtifacts>
-    </hudson.plugins.copyartifact.CopyArtifact>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/build_deploy_test.sh
-</command>
-    </hudson.tasks.Shell>
-  </builders>
-  <publishers>
-    <hudson.tasks.ArtifactArchiver>
-      <artifacts>*, logs/*</artifacts>
-      <allowEmptyArchive>false</allowEmptyArchive>
-      <onlyIfSuccessful>false</onlyIfSuccessful>
-      <fingerprint>false</fingerprint>
-      <defaultExcludes>true</defaultExcludes>
-    </hudson.tasks.ArtifactArchiver>
-    <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
-      <regexp>_:.*</regexp>
-      <regexpForFailed>_:.*</regexpForFailed>
-      <setForMatrix>false</setForMatrix>
-    </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
-  </publishers>
-  <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>#${BUILD_NUMBER} ${ENV,var=&quot;UBUNTU_RELEASE&quot;}-${ENV,var=&quot;OPENSTACK_RELEASE&quot;}-${ENV,var=&quot;INSTALLATION_SOURCE&quot;}-${ENV,var=&quot;CHARM_SET&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
-    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
-  </buildWrappers>
-</project>
\ No newline at end of file

=== removed directory 'deployment/jobs/deploy_openstack_baremetal'
=== removed file 'deployment/jobs/deploy_openstack_baremetal/config.xml'
--- deployment/jobs/deploy_openstack_baremetal/config.xml	2015-02-05 22:19:52 +0000
+++ deployment/jobs/deploy_openstack_baremetal/config.xml	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description>* NOT intended to be run manually, although it can be REBUILT.&#xd;
-* Use a trigger to hit this job with parameters.&#xd;
-* Deploys Ubuntu OpenStack from ?.yaml bundle from openstack-charm-testing.&#xd;
-* Job PASSES if the bundle deploys cleanly.&#xd;
-* Other fails such as tempest will not cause job fail.&#xd;
-&#xd;
-</description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>180</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>30</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>UBUNTU_RELEASE</name>
-          <description></description>
-          <defaultValue>utopic</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>OPENSTACK_RELEASE</name>
-          <description></description>
-          <defaultValue>juno</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>INSTALLATION_SOURCE</name>
-          <description></description>
-          <defaultValue>default</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>CHARM_SET</name>
-          <description></description>
-          <defaultValue>next.yaml</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.FileParameterDefinition>
-          <name>custom-other.yaml</name>
-          <description></description>
-        </hudson.model.FileParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>DISPLAY_NAME</name>
-          <description></description>
-          <defaultValue></defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>MP_TRIGGER</name>
-          <description></description>
-          <defaultValue></defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>MP_SRC_BR</name>
-          <description></description>
-          <defaultValue></defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>MP_TGT_BR</name>
-          <description>REBUILD is ok, but this job NOT intended to be run manually
-See the manual_trigger_deploy_with_deployer job instead if you need to kick off a deployment.
-</description>
-          <defaultValue></defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.BooleanParameterDefinition>
-          <name>TEMPEST_SMOKE</name>
-          <description>Enable to run tempest smoke tests after deployment.  Keep on by default.</description>
-          <defaultValue>true</defaultValue>
-        </hudson.model.BooleanParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>JUJU_SOURCE</name>
-          <description></description>
-          <defaultValue></defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.BooleanParameterDefinition>
-          <name>NO_POST_DESTROY</name>
-          <description>Set true to skip destroy after deployment.  Note that the enviro will most likely be torn down by the next job!</description>
-          <defaultValue>false</defaultValue>
-        </hudson.model.BooleanParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
-      <autoRebuild>false</autoRebuild>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>3</maxConcurrentTotal>
-      <throttleEnabled>true</throttleEnabled>
-      <throttleOption>project</throttleOption>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
-  </properties>
-  <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>baremetal || dellstack</assignedNode>
-  <canRoam>false</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers/>
-  <concurrentBuild>true</concurrentBuild>
-  <builders>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-${OSCI_ROOT}/job-parts/part_workspace_cleanup.sh</command>
-    </hudson.tasks.Shell>
-    <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.32.1">
-      <project>manual_trigger_deploy_with_deployer</project>
-      <filter>custom-other.yaml</filter>
-      <target></target>
-      <excludes></excludes>
-      <selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
-      <optional>true</optional>
-      <doNotFingerprintArtifacts>false</doNotFingerprintArtifacts>
-    </hudson.plugins.copyartifact.CopyArtifact>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-#${OSCI_ROOT}/job-parts/build_deploy_test.sh
-
-echo &quot;---------- would have deployed to dellstack ----------&quot;
-</command>
-    </hudson.tasks.Shell>
-  </builders>
-  <publishers>
-    <hudson.tasks.ArtifactArchiver>
-      <artifacts>*, logs/*</artifacts>
-      <allowEmptyArchive>false</allowEmptyArchive>
-      <onlyIfSuccessful>false</onlyIfSuccessful>
-      <fingerprint>false</fingerprint>
-      <defaultExcludes>true</defaultExcludes>
-    </hudson.tasks.ArtifactArchiver>
-    <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.9">
-      <regexp>_:.*</regexp>
-      <regexpForFailed>_:.*</regexpForFailed>
-      <setForMatrix>false</setForMatrix>
-    </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
-  </publishers>
-  <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>#${BUILD_NUMBER} ${ENV,var=&quot;UBUNTU_RELEASE&quot;}-${ENV,var=&quot;OPENSTACK_RELEASE&quot;}-${ENV,var=&quot;INSTALLATION_SOURCE&quot;}-${ENV,var=&quot;CHARM_SET&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
-    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
-  </buildWrappers>
-</project>
\ No newline at end of file

=== modified file 'deployment/jobs/deploy_with_deployer/config.xml'
--- deployment/jobs/deploy_with_deployer/config.xml	2015-05-17 14:36:21 +0000
+++ deployment/jobs/deploy_with_deployer/config.xml	2015-08-28 16:23:16 +0000
@@ -11,8 +11,8 @@
   <logRotator class="hudson.tasks.LogRotator">
     <daysToKeep>-1</daysToKeep>
     <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>45</artifactDaysToKeep>
-    <artifactNumToKeep>500</artifactNumToKeep>
+    <artifactDaysToKeep>60</artifactDaysToKeep>
+    <artifactNumToKeep>600</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -86,18 +86,16 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>4</maxConcurrentTotal>
-      <categories/>
+      <maxConcurrentTotal>2</maxConcurrentTotal>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
-      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
   <assignedNode>x86_64 || slave || trusty-slave</assignedNode>
   <canRoam>false</canRoam>
-  <disabled>false</disabled>
+  <disabled>true</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers/>

=== modified file 'deployment/jobs/deployer_quick_check/config.xml'
--- deployment/jobs/deployer_quick_check/config.xml	2015-05-17 14:36:21 +0000
+++ deployment/jobs/deployer_quick_check/config.xml	2015-08-28 16:23:16 +0000
@@ -5,8 +5,8 @@
   <logRotator class="hudson.tasks.LogRotator">
     <daysToKeep>-1</daysToKeep>
     <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>45</artifactDaysToKeep>
-    <artifactNumToKeep>500</artifactNumToKeep>
+    <artifactDaysToKeep>60</artifactDaysToKeep>
+    <artifactNumToKeep>600</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -100,7 +100,7 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>16</maxConcurrentTotal>
+      <maxConcurrentTotal>2</maxConcurrentTotal>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
@@ -145,7 +145,7 @@
   <buildWrappers>
     <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>#${BUILD_NUMBER} ${ENV,var=&quot;BUNDLE_FILE&quot;} ${ENV,var=&quot;BUNDLE_TARGET&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;BUNDLE_FILE&quot;} ${ENV,var=&quot;BUNDLE_TARGET&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;} ${ENV,var=&quot;NODE_NAME&quot;}</template>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== modified file 'deployment/jobs/git_deploy_with_deployer/config.xml'
--- deployment/jobs/git_deploy_with_deployer/config.xml	2015-07-09 21:17:57 +0000
+++ deployment/jobs/git_deploy_with_deployer/config.xml	2015-08-28 16:23:16 +0000
@@ -3,10 +3,10 @@
   <actions/>
   <description></description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>100</daysToKeep>
-    <numToKeep>100</numToKeep>
-    <artifactDaysToKeep>45</artifactDaysToKeep>
-    <artifactNumToKeep>500</artifactNumToKeep>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>60</artifactDaysToKeep>
+    <artifactNumToKeep>600</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -59,7 +59,7 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>2</maxConcurrentTotal>
+      <maxConcurrentTotal>1</maxConcurrentTotal>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
@@ -68,7 +68,7 @@
   <scm class="hudson.scm.NullSCM"/>
   <assignedNode>x86_64 || slave || trusty-slave</assignedNode>
   <canRoam>false</canRoam>
-  <disabled>false</disabled>
+  <disabled>true</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers/>

=== modified file 'deployment/jobs/manual_deploy_single_charm/config.xml'
--- deployment/jobs/manual_deploy_single_charm/config.xml	2015-05-17 14:36:21 +0000
+++ deployment/jobs/manual_deploy_single_charm/config.xml	2015-08-28 16:23:16 +0000
@@ -113,7 +113,7 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>12</maxConcurrentTotal>
+      <maxConcurrentTotal>2</maxConcurrentTotal>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>

=== modified file 'deployment/jobs/manual_trigger_deploy_with_deployer/config.xml'
--- deployment/jobs/manual_trigger_deploy_with_deployer/config.xml	2015-05-17 14:36:21 +0000
+++ deployment/jobs/manual_trigger_deploy_with_deployer/config.xml	2015-08-28 16:23:16 +0000
@@ -98,20 +98,6 @@
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>LAB</name>
-          <description>/!\ CAUTION:  LAB is a Work In Progress /!\
-serverstack (deploy on OpenStack)
-dellstack (deploy on baremetal via MAAS)
-dellstack-power (deploy on Power8 baremetal via MAAS)</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>serverstack</string>
-              <string>dellstack</string>
-              <string>dellstack-power</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">

=== modified file 'deployment/jobs/manual_trigger_mojo/config.xml'
--- deployment/jobs/manual_trigger_mojo/config.xml	2015-03-31 20:59:51 +0000
+++ deployment/jobs/manual_trigger_mojo/config.xml	2015-08-28 16:23:16 +0000
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <project>
   <actions/>
-  <description>* Manually trigger a mojo run with the chosen parameters.&#xd;
-* Calls mojo_runner.</description>
+  <description>Manually trigger a single mojo run with the chosen parameters.&lt;br\&gt;&#xd;
+Calls mojo_runner. &lt;br\&gt;&#xd;
+&lt;i&gt;Consider trigger_by_mojo_group to fire off sets of specs, with many available pivot points.&lt;/i&gt;</description>
   <logRotator class="hudson.tasks.LogRotator">
     <daysToKeep>90</daysToKeep>
     <numToKeep>-1</numToKeep>
@@ -18,45 +19,67 @@
           <description>Spec to run.</description>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
-              <string>specs/full_stack/charmhelper_upgrade/icehouse</string>
-              <string>specs/full_stack/charmhelper_upgrade/juno</string>
-              <string>specs/full_stack/charmhelper_upgrade/kilo</string>
-              <string>#</string>
-              <string>specs/full_stack/charmhelper_upgrade_ha/icehouse</string>
-              <string>specs/full_stack/charmhelper_upgrade_ha/juno</string>
-              <string>specs/full_stack/charmhelper_upgrade_ha/kilo</string>
-              <string>#</string>
+              <string>specs/full_stack/next_deploy/icehouse</string>
+              <string>specs/full_stack/next_deploy/juno</string>
+              <string>specs/full_stack/next_deploy/kilo</string>
+              <string>specs/full_stack/next_deploy/liberty</string>
               <string>specs/full_stack/ha_phased/icehouse</string>
               <string>specs/full_stack/ha_phased/juno</string>
               <string>specs/full_stack/ha_phased/kilo</string>
-              <string>#</string>
+              <string>specs/full_stack/ha_phased/liberty</string>
               <string>specs/full_stack/ha_phased_chaos_pony/icehouse</string>
               <string>specs/full_stack/ha_phased_chaos_pony/juno</string>
               <string>specs/full_stack/ha_phased_chaos_pony/kilo</string>
-              <string>#</string>
-              <string>specs/full_stack/next_deploy/icehouse</string>
-              <string>specs/full_stack/next_deploy/juno</string>
-              <string>specs/full_stack/next_deploy/kilo</string>
-              <string>#</string>
+              <string>specs/full_stack/ha_phased_chaos_pony/liberty</string>
               <string>specs/full_stack/next_deploy_ssl/icehouse</string>
               <string>specs/full_stack/next_deploy_ssl/juno</string>
               <string>specs/full_stack/next_deploy_ssl/kilo</string>
-              <string>#</string>
+              <string>specs/full_stack/next_deploy_ssl/liberty</string>
+              <string>specs/full_stack/charmhelper_upgrade/icehouse</string>
+              <string>specs/full_stack/charmhelper_upgrade/juno</string>
+              <string>specs/full_stack/charmhelper_upgrade/kilo</string>
+              <string>specs/full_stack/charmhelper_upgrade/liberty</string>
               <string>specs/full_stack/stable_to_next/icehouse</string>
               <string>specs/full_stack/stable_to_next/juno</string>
               <string>specs/full_stack/stable_to_next/kilo</string>
-              <string>#</string>
-              <string>specs/dev/bug1389670</string>
-              <string>specs/dev/dvr</string>
-              <string>specs/dev/full_nrpe</string>
+              <string>specs/full_stack/stable_to_next/liberty</string>
+              <string>specs/full_stack/stable_deploy/icehouse</string>
+              <string>specs/full_stack/stable_deploy/juno</string>
+              <string>specs/full_stack/stable_deploy/kilo</string>
+              <string>specs/full_stack/stable_deploy/liberty</string>
+              <string>specs/full_stack/charmhelper_upgrade_ha/icehouse</string>
+              <string>specs/full_stack/charmhelper_upgrade_ha/juno</string>
+              <string>specs/full_stack/charmhelper_upgrade_ha/kilo</string>
+              <string>specs/full_stack/charmhelper_upgrade_ha/liberty</string>
+              <string>specs/full_stack/stable_to_next_ha/icehouse</string>
+              <string>specs/full_stack/stable_to_next_ha/juno</string>
+              <string>specs/full_stack/stable_to_next_ha/kilo</string>
+              <string>specs/full_stack/stable_to_next_ha/liberty</string>
+              <string>specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse</string>
+              <string>specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse</string>
+              <string>specs/object_storage/swift_proxy/ha_serial_scaleout/juno</string>
+              <string>specs/object_storage/swift_proxy/ha_serial_scaleout/kilo</string>
+              <string>specs/object_storage/swift_proxy/simple_nonha/icehouse</string>
+              <string>specs/object_storage/swift_proxy/simple_nonha/juno</string>
+              <string>specs/object_storage/swift_proxy/simple_nonha/kilo</string>
+              <string>specs/object_storage/ceph_radosgw/simple_nonha/icehouse</string>
+              <string>specs/object_storage/ceph_radosgw/simple_nonha/juno</string>
+              <string>specs/object_storage/ceph_radosgw/simple_nonha/kilo</string>
+              <string>specs/object_storage/ceph_radosgw/ha/icehouse</string>
+              <string>specs/object_storage/ceph_radosgw/ha/juno</string>
+              <string>specs/object_storage/ceph_radosgw/ha/kilo</string>
               <string>specs/dev/haproxy_always</string>
               <string>specs/dev/keystone_ssl</string>
+              <string>specs/dev/bug1389670/mysql</string>
+              <string>specs/dev/bug1389670/percona-cluster</string>
               <string>specs/dev/multicast_port_change</string>
+              <string>specs/dev/nova_cc_legacy_neutron</string>
               <string>specs/dev/neutron_ha</string>
+              <string>specs/dev/swift_nrpe/simple_nonha</string>
               <string>specs/dev/novaccalch</string>
-              <string>specs/dev/nova_cc_legacy_neutron</string>
-              <string>specs/dev/swift_nrpe</string>
               <string>specs/dev/vxlan</string>
+              <string>specs/dev/full_nrpe</string>
+              <string>specs/dev/dvr</string>
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
@@ -71,6 +94,7 @@
           <description></description>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
+              <string>wily</string>
               <string>vivid</string>
               <string>utopic</string>
               <string>trusty</string>
@@ -86,7 +110,7 @@
         <hudson.model.StringParameterDefinition>
           <name>MOJO_OPENSTACK_SPECS_REPO</name>
           <description>Optionally override this with an arbitrary branch.</description>
-          <defaultValue>lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs</defaultValue>
+          <defaultValue></defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
           <name>JUJU_SOURCE</name>
@@ -127,7 +151,7 @@
   <triggers/>
   <concurrentBuild>true</concurrentBuild>
   <builders>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
           <configs>

=== modified file 'deployment/jobs/mojo_runner/config.xml'
--- deployment/jobs/mojo_runner/config.xml	2015-07-09 21:17:57 +0000
+++ deployment/jobs/mojo_runner/config.xml	2015-08-28 16:23:16 +0000
@@ -4,10 +4,10 @@
   <description>* This is a runner/wrapper job for mojo specs.&#xd;
 * Use the manual_trigger_mojo to initiate manual runs.</description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>60</daysToKeep>
+    <daysToKeep>-1</daysToKeep>
     <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>30</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <artifactDaysToKeep>90</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -16,7 +16,7 @@
         <hudson.model.StringParameterDefinition>
           <name>MOJO_OPENSTACK_SPECS_REPO</name>
           <description>Optionally override with an arbitrary branch.</description>
-          <defaultValue>lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs</defaultValue>
+          <defaultValue>lp:~1chb1n/openstack-mojo-specs/net-id-ext-port-fix</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>MOJO_SPEC</name>
@@ -57,18 +57,16 @@
     </com.sonyericsson.rebuild.RebuildSettings>
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>1</maxConcurrentTotal>
-      <categories/>
+      <maxConcurrentTotal>2</maxConcurrentTotal>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
-      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
   <assignedNode>x86_64 || slave || trusty-slave</assignedNode>
   <canRoam>false</canRoam>
-  <disabled>false</disabled>
+  <disabled>true</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers/>
@@ -97,7 +95,7 @@
   <buildWrappers>
     <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>#${BUILD_NUMBER} ${ENV,var=&quot;MOJO_SPEC&quot;} ${ENV,var=&quot;MOJO_SPEC_CUSTOM&quot;} ${ENV,var=&quot;MOJO_SERIES&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== modified file 'deployment/jobs/mojo_runner_baremetal/config.xml'
--- deployment/jobs/mojo_runner_baremetal/config.xml	2015-07-09 21:17:57 +0000
+++ deployment/jobs/mojo_runner_baremetal/config.xml	2015-08-28 16:23:16 +0000
@@ -17,7 +17,7 @@
         <hudson.model.StringParameterDefinition>
           <name>MOJO_OPENSTACK_SPECS_REPO</name>
           <description>Optionally override with an arbitrary branch.</description>
-          <defaultValue>lp:~1chb1n/openstack-mojo-specs/baremetal-init</defaultValue>
+          <defaultValue>lp:~1chb1n/openstack-mojo-specs/net-id-ext-port-fix</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
           <name>MOJO_SPEC</name>
@@ -27,6 +27,11 @@
               <string>specs/full_stack/next_deploy_baremetal/icehouse</string>
               <string>specs/full_stack/next_deploy_baremetal/juno</string>
               <string>specs/full_stack/next_deploy_baremetal/kilo</string>
+              <string>specs/full_stack/next_deploy_baremetal/liberty</string>
+              <string>specs/full_stack/stable_deploy_baremetal/icehouse</string>
+              <string>specs/full_stack/stable_deploy_baremetal/juno</string>
+              <string>specs/full_stack/stable_deploy_baremetal/kilo</string>
+              <string>specs/full_stack/stable_deploy_baremetal/liberty</string>
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
@@ -44,6 +49,7 @@
               <string>precise</string>
               <string>utopic</string>
               <string>vivid</string>
+              <string>wily</string>
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
@@ -76,17 +82,15 @@
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
       <maxConcurrentTotal>1</maxConcurrentTotal>
-      <categories/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
-      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
   <assignedNode>dellstack</assignedNode>
   <canRoam>false</canRoam>
-  <disabled>false</disabled>
+  <disabled>true</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers/>
@@ -95,7 +99,7 @@
     <hudson.tasks.Shell>
       <command>#!/bin/bash -e
 #  Mojo runner for OSCI
-${OSCI_ROOT}/job-parts/build_mojo_runner_baremetal.sh</command>
+${OSCI_ROOT}/job-parts/build_mojo_runner.sh</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
@@ -115,7 +119,7 @@
   <buildWrappers>
     <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>#${BUILD_NUMBER} ${ENV,var=&quot;MOJO_SPEC&quot;} ${ENV,var=&quot;MOJO_SPEC_CUSTOM&quot;} ${ENV,var=&quot;MOJO_SERIES&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
 </project>
\ No newline at end of file

=== removed directory 'deployment/jobs/openstack_lab_switcher'
=== removed file 'deployment/jobs/openstack_lab_switcher/config.xml'
--- deployment/jobs/openstack_lab_switcher/config.xml	2015-02-05 22:19:52 +0000
+++ deployment/jobs/openstack_lab_switcher/config.xml	1970-01-01 00:00:00 +0000
@@ -1,229 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description>THIS TRIGGER IS EXPERIMENTAL AND IN DEVELOPMENT&#xd;
-BEST NOT USE IT JUST YET&#xd;
-&#xd;
-* This LAB switcher sits between the TRIGGERS and the DEPLOYERS to determine where to deploy OpenStack.&#xd;
-* Not intended to be run manually.</description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>30</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.StringParameterDefinition>
-          <name>UBUNTU_RELEASE</name>
-          <description></description>
-          <defaultValue>utopic</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>OPENSTACK_RELEASE</name>
-          <description></description>
-          <defaultValue>juno</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>INSTALLATION_SOURCE</name>
-          <description></description>
-          <defaultValue>default</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>CHARM_SET</name>
-          <description></description>
-          <defaultValue>next.yaml</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.FileParameterDefinition>
-          <name>custom-other.yaml</name>
-          <description></description>
-        </hudson.model.FileParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>DISPLAY_NAME</name>
-          <description></description>
-          <defaultValue></defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>MP_TRIGGER</name>
-          <description></description>
-          <defaultValue></defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>MP_SRC_BR</name>
-          <description></description>
-          <defaultValue></defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>MP_TGT_BR</name>
-          <description>REBUILD is ok, but this job NOT intended to be run manually.  
-See the manual_trigger_deploy_with_deployer job instead if you need to kick off a deployment.
-</description>
-          <defaultValue></defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.BooleanParameterDefinition>
-          <name>TEMPEST_SMOKE</name>
-          <description>Enable to run tempest smoke tests after deployment.  Keep on by default.</description>
-          <defaultValue>true</defaultValue>
-        </hudson.model.BooleanParameterDefinition>
-        <hudson.model.BooleanParameterDefinition>
-          <name>JUJU_DEVEL</name>
-          <description>Use juju-devel to deploy.</description>
-          <defaultValue>false</defaultValue>
-        </hudson.model.BooleanParameterDefinition>
-        <hudson.model.BooleanParameterDefinition>
-          <name>NO_POST_DESTROY</name>
-          <description>Set true to skip destroy after deployment.  Note that the enviro will most likely be torn down by the next job!</description>
-          <defaultValue>false</defaultValue>
-        </hudson.model.BooleanParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>LAB</name>
-          <description>THIS TRIGGER IS EXPERIMENTAL AND IN DEVELOPMENT
-BEST NOT USE IT JUST YET</description>
-          <defaultValue>serverstack</defaultValue>
-        </hudson.model.StringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
-      <autoRebuild>false</autoRebuild>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>0</maxConcurrentTotal>
-      <categories/>
-      <throttleEnabled>true</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <configVersion>1</configVersion>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
-  </properties>
-  <scm class="hudson.scm.NullSCM"/>
-  <canRoam>true</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers/>
-  <concurrentBuild>false</concurrentBuild>
-  <builders>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash -e
-
-# Source the common functions
-. ${OSCI_ROOT}/job-parts/osci_job_common.sh
-
-f_line &quot;LAB selector&quot;
-echo $LAB
-f_env_no_pass
-
-cd $OSCI_ROOT
-
-case &quot;$LAB&quot; in
-  serverstack)
-    echo &quot;serverstack:  deploy on OpenStack undercloud.&quot;
-    ;;
-  dellstack)
-    echo &quot;dellstack:  deploy on AMD64 baremetal via MAAS.&quot;
-    ;;
-  dellstack-power)
-    echo &quot;dellstack-power:  deploy on Power8 via MAAS.&quot;
-    ;;
-  *)
-    echo &quot;Unknown LAB value.&quot;
-    exit 1
-    ;;
-esac
-</command>
-    </hudson.tasks.Shell>
-    <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.32.1">
-      <project>X_manual_trigger_deploy_openstack</project>
-      <filter>custom-other.yaml</filter>
-      <target></target>
-      <excludes></excludes>
-      <selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
-      <optional>true</optional>
-      <doNotFingerprintArtifacts>false</doNotFingerprintArtifacts>
-    </hudson.plugins.copyartifact.CopyArtifact>
-    <org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder plugin="conditional-buildstep@1.3.3">
-      <condition class="org.jenkins_ci.plugins.run_condition.core.StringsMatchCondition" plugin="run-condition@1.0">
-        <arg1>${ENV,var=&quot;LAB&quot;}</arg1>
-        <arg2>dellstack</arg2>
-        <ignoreCase>true</ignoreCase>
-      </condition>
-      <buildStep class="hudson.plugins.parameterizedtrigger.TriggerBuilder" plugin="parameterized-trigger@2.25">
-        <configs>
-          <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-            <configs>
-              <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
-            </configs>
-            <projects>deploy_openstack_baremetal</projects>
-            <condition>ALWAYS</condition>
-            <triggerWithNoParameters>false</triggerWithNoParameters>
-            <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
-          </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-        </configs>
-      </buildStep>
-      <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
-    </org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
-    <org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder plugin="conditional-buildstep@1.3.3">
-      <condition class="org.jenkins_ci.plugins.run_condition.core.StringsMatchCondition" plugin="run-condition@1.0">
-        <arg1>${ENV,var=&quot;LAB&quot;}</arg1>
-        <arg2>dellstack-power</arg2>
-        <ignoreCase>true</ignoreCase>
-      </condition>
-      <buildStep class="hudson.plugins.parameterizedtrigger.TriggerBuilder" plugin="parameterized-trigger@2.25">
-        <configs>
-          <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-            <configs>
-              <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
-            </configs>
-            <projects>_juju_stat_this</projects>
-            <condition>ALWAYS</condition>
-            <triggerWithNoParameters>false</triggerWithNoParameters>
-            <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
-          </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-        </configs>
-      </buildStep>
-      <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
-    </org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
-    <org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder plugin="conditional-buildstep@1.3.3">
-      <condition class="org.jenkins_ci.plugins.run_condition.core.StringsMatchCondition" plugin="run-condition@1.0">
-        <arg1>${ENV,var=&quot;LAB&quot;}</arg1>
-        <arg2>serverstack</arg2>
-        <ignoreCase>true</ignoreCase>
-      </condition>
-      <buildStep class="hudson.plugins.parameterizedtrigger.TriggerBuilder" plugin="parameterized-trigger@2.25">
-        <configs>
-          <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-            <configs class="empty-list"/>
-            <projects>deploy_with_deployer</projects>
-            <condition>ALWAYS</condition>
-            <triggerWithNoParameters>false</triggerWithNoParameters>
-            <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
-          </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-        </configs>
-      </buildStep>
-      <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
-    </org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
-  </builders>
-  <publishers>
-    <hudson.tasks.ArtifactArchiver>
-      <artifacts>*, logs/*</artifacts>
-      <allowEmptyArchive>true</allowEmptyArchive>
-      <onlyIfSuccessful>false</onlyIfSuccessful>
-      <fingerprint>false</fingerprint>
-      <defaultExcludes>true</defaultExcludes>
-    </hudson.tasks.ArtifactArchiver>
-    <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.9">
-      <regexp>_:.*</regexp>
-      <regexpForFailed>_:.*</regexpForFailed>
-      <setForMatrix>false</setForMatrix>
-    </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
-  </publishers>
-  <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>#${BUILD_NUMBER} ${ENV,var=&quot;UBUNTU_RELEASE&quot;}-${ENV,var=&quot;OPENSTACK_RELEASE&quot;}-${ENV,var=&quot;INSTALLATION_SOURCE&quot;}-${ENV,var=&quot;CHARM_SET&quot;} ${ENV,var=&quot;LAB&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
-    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
-  </buildWrappers>
-</project>
\ No newline at end of file

=== modified file 'deployment/jobs/scheduled_trigger_amulet/config.xml'
--- deployment/jobs/scheduled_trigger_amulet/config.xml	2015-01-21 05:51:34 +0000
+++ deployment/jobs/scheduled_trigger_amulet/config.xml	2015-08-28 16:23:16 +0000
@@ -4,10 +4,10 @@
   <description>* Triggers amulet tests for all branches via branch_scanner job&#xd;
 * Weekly on Sunday</description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>90</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -36,7 +36,7 @@
   </triggers>
   <concurrentBuild>false</concurrentBuild>
   <builders>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
           <configs>
@@ -75,7 +75,7 @@
   </builders>
   <publishers/>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.15"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
       <template>#${BUILD_NUMBER}</template>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>

=== modified file 'deployment/jobs/scheduled_trigger_deploy/config.xml'
--- deployment/jobs/scheduled_trigger_deploy/config.xml	2015-07-09 21:17:57 +0000
+++ deployment/jobs/scheduled_trigger_deploy/config.xml	2015-08-28 16:23:16 +0000
@@ -4,10 +4,10 @@
   <description>* Triggers deployments for all branches via branch_scanner job&#xd;
 * Daily</description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>90</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>

=== modified file 'deployment/jobs/scheduled_trigger_lint/config.xml'
--- deployment/jobs/scheduled_trigger_lint/config.xml	2015-07-09 21:17:57 +0000
+++ deployment/jobs/scheduled_trigger_lint/config.xml	2015-08-28 16:23:16 +0000
@@ -4,10 +4,10 @@
   <description>* Triggers lint check for all branches via branch_scanner job&#xd;
 * Daily</description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>90</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>

=== removed directory 'deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_precise'
=== removed file 'deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_precise/config.xml'
--- deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_precise/config.xml	2015-07-09 21:17:57 +0000
+++ deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_precise/config.xml	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description></description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>90</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
-      <autoRebuild>false</autoRebuild>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>1</maxConcurrentTotal>
-      <categories/>
-      <throttleEnabled>true</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <configVersion>1</configVersion>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
-  </properties>
-  <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>x86_64 || slave || trusty-slave</assignedNode>
-  <canRoam>false</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers>
-    <hudson.triggers.TimerTrigger>
-      <spec>05 4 * * 6
-</spec>
-    </hudson.triggers.TimerTrigger>
-  </triggers>
-  <concurrentBuild>false</concurrentBuild>
-  <builders>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
-      <configs>
-        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-          <configs>
-            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-              <properties>SCHEDULED_TRIGGER=TRUE
-MOJO_SPEC=specs/full_stack/charmhelper_upgrade/icehouse
-MOJO_SERIES=precise
-DISPLAY_NAME=sched</properties>
-            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-          </configs>
-          <projects>mojo_runner</projects>
-          <condition>ALWAYS</condition>
-          <triggerWithNoParameters>false</triggerWithNoParameters>
-          <block>
-            <buildStepFailureThreshold>
-              <name>FAILURE</name>
-              <ordinal>2</ordinal>
-              <color>RED</color>
-              <completeBuild>true</completeBuild>
-            </buildStepFailureThreshold>
-            <unstableThreshold>
-              <name>UNSTABLE</name>
-              <ordinal>1</ordinal>
-              <color>YELLOW</color>
-              <completeBuild>true</completeBuild>
-            </unstableThreshold>
-            <failureThreshold>
-              <name>FAILURE</name>
-              <ordinal>2</ordinal>
-              <color>RED</color>
-              <completeBuild>true</completeBuild>
-            </failureThreshold>
-          </block>
-          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
-        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-      </configs>
-    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
-  </builders>
-  <publishers/>
-  <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>#${BUILD_NUMBER}</template>
-    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
-  </buildWrappers>
-</project>
\ No newline at end of file

=== removed directory 'deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_trusty'
=== removed file 'deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_trusty/config.xml'
--- deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_trusty/config.xml	2015-07-09 21:17:57 +0000
+++ deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_trusty/config.xml	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description></description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>90</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
-      <autoRebuild>false</autoRebuild>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>1</maxConcurrentTotal>
-      <categories/>
-      <throttleEnabled>true</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <configVersion>1</configVersion>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
-  </properties>
-  <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>x86_64 || slave || trusty-slave</assignedNode>
-  <canRoam>false</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers>
-    <hudson.triggers.TimerTrigger>
-      <spec>05 4 * * 6
-</spec>
-    </hudson.triggers.TimerTrigger>
-  </triggers>
-  <concurrentBuild>false</concurrentBuild>
-  <builders>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
-      <configs>
-        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-          <configs>
-            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-              <properties>SCHEDULED_TRIGGER=TRUE
-MOJO_SPEC=specs/full_stack/charmhelper_upgrade/icehouse
-MOJO_SERIES=trusty
-DISPLAY_NAME=sched</properties>
-            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-          </configs>
-          <projects>mojo_runner</projects>
-          <condition>ALWAYS</condition>
-          <triggerWithNoParameters>false</triggerWithNoParameters>
-          <block>
-            <buildStepFailureThreshold>
-              <name>FAILURE</name>
-              <ordinal>2</ordinal>
-              <color>RED</color>
-              <completeBuild>true</completeBuild>
-            </buildStepFailureThreshold>
-            <unstableThreshold>
-              <name>UNSTABLE</name>
-              <ordinal>1</ordinal>
-              <color>YELLOW</color>
-              <completeBuild>true</completeBuild>
-            </unstableThreshold>
-            <failureThreshold>
-              <name>FAILURE</name>
-              <ordinal>2</ordinal>
-              <color>RED</color>
-              <completeBuild>true</completeBuild>
-            </failureThreshold>
-          </block>
-          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
-        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-      </configs>
-    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
-  </builders>
-  <publishers/>
-  <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>#${BUILD_NUMBER}</template>
-    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
-  </buildWrappers>
-</project>
\ No newline at end of file

=== removed directory 'deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_kilo_vivid'
=== removed file 'deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_kilo_vivid/config.xml'
--- deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_kilo_vivid/config.xml	2015-07-09 21:17:57 +0000
+++ deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_kilo_vivid/config.xml	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description></description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>90</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
-      <autoRebuild>false</autoRebuild>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>1</maxConcurrentTotal>
-      <categories/>
-      <throttleEnabled>true</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <configVersion>1</configVersion>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
-  </properties>
-  <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>x86_64 || slave || trusty-slave</assignedNode>
-  <canRoam>false</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers>
-    <hudson.triggers.TimerTrigger>
-      <spec>05 4 * * 6
-</spec>
-    </hudson.triggers.TimerTrigger>
-  </triggers>
-  <concurrentBuild>false</concurrentBuild>
-  <builders>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
-      <configs>
-        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-          <configs>
-            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-              <properties>SCHEDULED_TRIGGER=TRUE
-MOJO_SPEC=specs/full_stack/charmhelper_upgrade/kilo
-MOJO_SERIES=vivid
-DISPLAY_NAME=sched</properties>
-            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-          </configs>
-          <projects>mojo_runner</projects>
-          <condition>ALWAYS</condition>
-          <triggerWithNoParameters>false</triggerWithNoParameters>
-          <block>
-            <buildStepFailureThreshold>
-              <name>FAILURE</name>
-              <ordinal>2</ordinal>
-              <color>RED</color>
-              <completeBuild>true</completeBuild>
-            </buildStepFailureThreshold>
-            <unstableThreshold>
-              <name>UNSTABLE</name>
-              <ordinal>1</ordinal>
-              <color>YELLOW</color>
-              <completeBuild>true</completeBuild>
-            </unstableThreshold>
-            <failureThreshold>
-              <name>FAILURE</name>
-              <ordinal>2</ordinal>
-              <color>RED</color>
-              <completeBuild>true</completeBuild>
-            </failureThreshold>
-          </block>
-          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
-        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-      </configs>
-    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
-  </builders>
-  <publishers/>
-  <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>#${BUILD_NUMBER}</template>
-    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
-  </buildWrappers>
-</project>
\ No newline at end of file

=== removed directory 'deployment/jobs/scheduled_trigger_mojo_ha_phased_juno_trusty'
=== removed file 'deployment/jobs/scheduled_trigger_mojo_ha_phased_juno_trusty/config.xml'
--- deployment/jobs/scheduled_trigger_mojo_ha_phased_juno_trusty/config.xml	2015-07-09 21:17:57 +0000
+++ deployment/jobs/scheduled_trigger_mojo_ha_phased_juno_trusty/config.xml	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description></description>
-  <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>90</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
-      <autoRebuild>false</autoRebuild>
-    </com.sonyericsson.rebuild.RebuildSettings>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
-      <maxConcurrentPerNode>1</maxConcurrentPerNode>
-      <maxConcurrentTotal>1</maxConcurrentTotal>
-      <categories/>
-      <throttleEnabled>true</throttleEnabled>
-      <throttleOption>project</throttleOption>
-      <configVersion>1</configVersion>
-    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
-  </properties>
-  <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>x86_64 || slave || trusty-slave</assignedNode>
-  <canRoam>false</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers>
-    <hudson.triggers.TimerTrigger>
-      <spec>05 2 * * 6
-</spec>
-    </hudson.triggers.TimerTrigger>
-  </triggers>
-  <concurrentBuild>false</concurrentBuild>
-  <builders>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
-      <configs>
-        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-          <configs>
-            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-              <properties>SCHEDULED_TRIGGER=TRUE
-MOJO_SPEC=specs/full_stack/ha_phased/juno
-MOJO_SERIES=trusty
-DISPLAY_NAME=sched</properties>
-            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-          </configs>
-          <projects>mojo_runner</projects>
-          <condition>ALWAYS</condition>
-          <triggerWithNoParameters>false</triggerWithNoParameters>
-          <block>
-            <buildStepFailureThreshold>
-              <name>FAILURE</name>
-              <ordinal>2</ordinal>
-              <color>RED</color>
-              <completeBuild>true</completeBuild>
-            </buildStepFailureThreshold>
-            <unstableThreshold>
-              <name>UNSTABLE</name>
-              <ordinal>1</ordinal>
-              <color>YELLOW</color>
-              <completeBuild>true</completeBuild>
-            </unstableThreshold>
-            <failureThreshold>
-              <name>FAILURE</name>
-              <ordinal>2</ordinal>
-              <color>RED</color>
-              <completeBuild>true</completeBuild>
-            </failureThreshold>
-          </block>
-          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
-        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-      </configs>
-    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
-  </builders>
-  <publishers/>
-  <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>#${BUILD_NUMBER}</template>
-    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
-  </buildWrappers>
-</project>
\ No newline at end of file

=== added directory 'deployment/jobs/scheduled_trigger_mojo_hot_all'
=== added file 'deployment/jobs/scheduled_trigger_mojo_hot_all/config.xml'
--- deployment/jobs/scheduled_trigger_mojo_hot_all/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/scheduled_trigger_mojo_hot_all/config.xml	2015-08-28 16:23:16 +0000
@@ -0,0 +1,88 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>Scheduled WEEKLY.&lt;br/&gt;&#xd;
+Runs ALL specs (!) for the HOT combos (those which we prioritize). &lt;br/&gt;&lt;br/&gt;&#xd;
+&#xd;
+Generally, hot combos are: &lt;br/&gt;&#xd;
+1. Ubuntu LTS releas(es) + OpenStack as shipped with LTS(s) &lt;br/&gt;&#xd;
+2. Most recent Ubuntu LTS release + Most recent OpenStack release (or current dev version if functional)&lt;br/&gt;&#xd;
+3. Current Ubuntu dev version + Current OpenStack dev version</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
+      <autoRebuild>false</autoRebuild>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
+      <maxConcurrentPerNode>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>1</maxConcurrentTotal>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>x86_64 || slave || trusty-slave</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <hudson.triggers.TimerTrigger>
+      <spec>18 00 * * 5
+</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>SCHEDULED_TRIGGER=TRUE
+TRIGGER_FINGER=HOT_ALL</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>trigger_by_mojo_group</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <block>
+            <buildStepFailureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </buildStepFailureThreshold>
+            <unstableThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+              <completeBuild>true</completeBuild>
+            </unstableThreshold>
+            <failureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </failureThreshold>
+          </block>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+      <template>#${BUILD_NUMBER}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/scheduled_trigger_mojo_hot_metal'
=== added file 'deployment/jobs/scheduled_trigger_mojo_hot_metal/config.xml'
--- deployment/jobs/scheduled_trigger_mojo_hot_metal/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/scheduled_trigger_mojo_hot_metal/config.xml	2015-08-28 16:23:16 +0000
@@ -0,0 +1,90 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>Scheduled DAILY.&lt;br/&gt;&#xd;
+&#xd;
+Deploys next and stable charm sets against bare metal, only for the HOT combos (those which we prioritize). &lt;br/&gt;&lt;br/&gt;&#xd;
+&#xd;
+Generally, hot combos are: &lt;br/&gt;&#xd;
+1. Ubuntu LTS releas(es) + OpenStack as shipped with LTS(s) &lt;br/&gt;&#xd;
+2. Most recent Ubuntu LTS release + Most recent OpenStack release (or current dev version if functional)&lt;br/&gt;&#xd;
+3. Current Ubuntu dev version + Current OpenStack dev version&#xd;
+</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
+      <autoRebuild>false</autoRebuild>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
+      <maxConcurrentPerNode>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>1</maxConcurrentTotal>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>x86_64 || slave || trusty-slave</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <hudson.triggers.TimerTrigger>
+      <spec>3 15 * * *
+</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>SCHEDULED_TRIGGER=TRUE
+TRIGGER_FINGER=HOT_METAL</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>trigger_by_mojo_group</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <block>
+            <buildStepFailureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </buildStepFailureThreshold>
+            <unstableThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+              <completeBuild>true</completeBuild>
+            </unstableThreshold>
+            <failureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </failureThreshold>
+          </block>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+      <template>#${BUILD_NUMBER}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/scheduled_trigger_mojo_hot_virtual'
=== added file 'deployment/jobs/scheduled_trigger_mojo_hot_virtual/config.xml'
--- deployment/jobs/scheduled_trigger_mojo_hot_virtual/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/scheduled_trigger_mojo_hot_virtual/config.xml	2015-08-28 16:23:16 +0000
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>Scheduled DAILY.&lt;br/&gt;&#xd;
+&#xd;
+Deploys next and stable charm sets (os-on-os) only for the HOT combos (those which we prioritize). &lt;br/&gt;&lt;br/&gt;&#xd;
+&#xd;
+Generally, hot combos are: &lt;br/&gt;&#xd;
+1. Ubuntu LTS releas(es) + OpenStack as shipped with LTS(s) &lt;br/&gt;&#xd;
+2. Most recent Ubuntu LTS release + Most recent OpenStack release (or current dev version if functional)&lt;br/&gt;&#xd;
+3. Current Ubuntu dev version + Current OpenStack dev version</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
+      <autoRebuild>false</autoRebuild>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
+      <maxConcurrentPerNode>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>1</maxConcurrentTotal>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>x86_64 || slave || trusty-slave</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <hudson.triggers.TimerTrigger>
+      <spec>3 15 * * *
+</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>SCHEDULED_TRIGGER=TRUE
+TRIGGER_FINGER=HOT_NEXT_AND_STABLE_VIRTUAL_DEPLOY</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>trigger_by_mojo_group</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <block>
+            <buildStepFailureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </buildStepFailureThreshold>
+            <unstableThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+              <completeBuild>true</completeBuild>
+            </unstableThreshold>
+            <failureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </failureThreshold>
+          </block>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+      <template>#${BUILD_NUMBER}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== added directory 'deployment/jobs/scheduled_trigger_mojo_stable_deploy'
=== added file 'deployment/jobs/scheduled_trigger_mojo_stable_deploy/config.xml'
--- deployment/jobs/scheduled_trigger_mojo_stable_deploy/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/scheduled_trigger_mojo_stable_deploy/config.xml	2015-08-28 16:23:16 +0000
@@ -0,0 +1,84 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>Scheduled WEEKLY.&lt;br/&gt;&#xd;
+Deploys all currently-supported combos of Ubuntu/OpenStack (on top of OpenStack), using the stable charms.</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
+      <autoRebuild>false</autoRebuild>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
+      <maxConcurrentPerNode>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>1</maxConcurrentTotal>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>x86_64 || slave || trusty-slave</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <hudson.triggers.TimerTrigger>
+      <spec>3 15 * * 5
+</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+              <properties>SCHEDULED_TRIGGER=TRUE
+TRIGGER_FINGER=STABLE_DEPLOY
+</properties>
+            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+          </configs>
+          <projects>trigger_by_mojo_group</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <block>
+            <buildStepFailureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </buildStepFailureThreshold>
+            <unstableThreshold>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
+              <completeBuild>true</completeBuild>
+            </unstableThreshold>
+            <failureThreshold>
+              <name>FAILURE</name>
+              <ordinal>2</ordinal>
+              <color>RED</color>
+              <completeBuild>true</completeBuild>
+            </failureThreshold>
+          </block>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+      <template>#${BUILD_NUMBER}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== modified file 'deployment/jobs/scheduled_trigger_single_charm/config.xml'
--- deployment/jobs/scheduled_trigger_single_charm/config.xml	2015-02-05 22:19:52 +0000
+++ deployment/jobs/scheduled_trigger_single_charm/config.xml	2015-08-28 16:23:16 +0000
@@ -5,10 +5,10 @@
 * Useful as a health indicator for each node&apos;s juju environment and configuration.&#xd;
 * Runs daily.</description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>90</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -36,7 +36,7 @@
   </triggers>
   <concurrentBuild>false</concurrentBuild>
   <builders>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
           <configs>
@@ -53,12 +53,12 @@
     </hudson.plugins.parameterizedtrigger.TriggerBuilder>
   </builders>
   <publishers>
-    <hudson.tasks.test.AggregatedTestResultPublisher plugin="junit@1.0">
+    <hudson.tasks.test.AggregatedTestResultPublisher plugin="junit@1.2-beta-4">
       <includeFailedBuilds>true</includeFailedBuilds>
     </hudson.tasks.test.AggregatedTestResultPublisher>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.15"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;}</template>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>

=== modified file 'deployment/jobs/scheduled_trigger_single_charm_jdev/config.xml'
--- deployment/jobs/scheduled_trigger_single_charm_jdev/config.xml	2015-02-05 22:19:52 +0000
+++ deployment/jobs/scheduled_trigger_single_charm_jdev/config.xml	2015-08-28 16:23:16 +0000
@@ -6,10 +6,10 @@
 * Useful as a health indicator for each node&apos;s juju environment and configuration.&#xd;
 * Runs daily.</description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>90</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -26,7 +26,7 @@
   </properties>
   <scm class="hudson.scm.NullSCM"/>
   <canRoam>true</canRoam>
-  <disabled>false</disabled>
+  <disabled>true</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
@@ -37,7 +37,7 @@
   </triggers>
   <concurrentBuild>false</concurrentBuild>
   <builders>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
           <configs>
@@ -55,12 +55,12 @@
     </hudson.plugins.parameterizedtrigger.TriggerBuilder>
   </builders>
   <publishers>
-    <hudson.tasks.test.AggregatedTestResultPublisher plugin="junit@1.0">
+    <hudson.tasks.test.AggregatedTestResultPublisher plugin="junit@1.2-beta-4">
       <includeFailedBuilds>true</includeFailedBuilds>
     </hudson.tasks.test.AggregatedTestResultPublisher>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.15"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;} jdev</template>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>

=== modified file 'deployment/jobs/scheduled_trigger_single_charm_jprop/config.xml'
--- deployment/jobs/scheduled_trigger_single_charm_jprop/config.xml	2015-02-05 22:19:52 +0000
+++ deployment/jobs/scheduled_trigger_single_charm_jprop/config.xml	2015-08-28 16:23:16 +0000
@@ -6,10 +6,10 @@
 * Useful as a health indicator for each node&apos;s juju environment and configuration.&#xd;
 * Runs daily.</description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>90</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -37,7 +37,7 @@
   </triggers>
   <concurrentBuild>false</concurrentBuild>
   <builders>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
           <configs>
@@ -55,12 +55,12 @@
     </hudson.plugins.parameterizedtrigger.TriggerBuilder>
   </builders>
   <publishers>
-    <hudson.tasks.test.AggregatedTestResultPublisher plugin="junit@1.3">
+    <hudson.tasks.test.AggregatedTestResultPublisher plugin="junit@1.2-beta-4">
       <includeFailedBuilds>true</includeFailedBuilds>
     </hudson.tasks.test.AggregatedTestResultPublisher>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
       <template>#${BUILD_NUMBER} ${ENV,var=&quot;NODE_NAME&quot;} jdev</template>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>

=== modified file 'deployment/jobs/scheduled_trigger_sourcedeploy_trusty_icehouse/config.xml'
--- deployment/jobs/scheduled_trigger_sourcedeploy_trusty_icehouse/config.xml	2015-07-09 21:17:57 +0000
+++ deployment/jobs/scheduled_trigger_sourcedeploy_trusty_icehouse/config.xml	2015-08-28 16:23:16 +0000
@@ -3,10 +3,10 @@
   <actions/>
   <description></description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>90</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -73,7 +73,7 @@
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
     <hudson.triggers.TimerTrigger>
-      <spec>00 01 * * 0</spec>
+      <spec>00 01 * * *</spec>
     </hudson.triggers.TimerTrigger>
   </triggers>
   <concurrentBuild>false</concurrentBuild>
@@ -82,9 +82,7 @@
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
           <configs>
-            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-              <properties>SCHEDULED_TRIGGER=TRUE</properties>
-            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+            <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
           </configs>
           <projects>git_deploy_with_deployer</projects>
           <condition>ALWAYS</condition>

=== modified file 'deployment/jobs/scheduled_trigger_sourcedeploy_trusty_juno/config.xml'
--- deployment/jobs/scheduled_trigger_sourcedeploy_trusty_juno/config.xml	2015-07-09 21:17:57 +0000
+++ deployment/jobs/scheduled_trigger_sourcedeploy_trusty_juno/config.xml	2015-08-28 16:23:16 +0000
@@ -3,10 +3,10 @@
   <actions/>
   <description></description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>90</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -73,7 +73,7 @@
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
     <hudson.triggers.TimerTrigger>
-      <spec>00 01 * * 0</spec>
+      <spec>00 01 * * *</spec>
     </hudson.triggers.TimerTrigger>
   </triggers>
   <concurrentBuild>false</concurrentBuild>
@@ -82,9 +82,7 @@
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
           <configs>
-            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-              <properties>SCHEDULED_TRIGGER=TRUE</properties>
-            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+            <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
           </configs>
           <projects>git_deploy_with_deployer</projects>
           <condition>ALWAYS</condition>

=== modified file 'deployment/jobs/scheduled_trigger_sourcedeploy_trusty_kilo/config.xml'
--- deployment/jobs/scheduled_trigger_sourcedeploy_trusty_kilo/config.xml	2015-07-09 21:17:57 +0000
+++ deployment/jobs/scheduled_trigger_sourcedeploy_trusty_kilo/config.xml	2015-08-28 16:23:16 +0000
@@ -3,10 +3,10 @@
   <actions/>
   <description></description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>90</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -73,7 +73,7 @@
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
     <hudson.triggers.TimerTrigger>
-      <spec>00 01 * * 0</spec>
+      <spec>00 01 * * *</spec>
     </hudson.triggers.TimerTrigger>
   </triggers>
   <concurrentBuild>false</concurrentBuild>
@@ -82,9 +82,7 @@
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
           <configs>
-            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-              <properties>SCHEDULED_TRIGGER=TRUE</properties>
-            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+            <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
           </configs>
           <projects>git_deploy_with_deployer</projects>
           <condition>ALWAYS</condition>

=== modified file 'deployment/jobs/scheduled_trigger_sourcedeploy_trusty_master/config.xml'
--- deployment/jobs/scheduled_trigger_sourcedeploy_trusty_master/config.xml	2015-07-09 21:17:57 +0000
+++ deployment/jobs/scheduled_trigger_sourcedeploy_trusty_master/config.xml	2015-08-28 16:23:16 +0000
@@ -3,10 +3,10 @@
   <actions/>
   <description></description>
   <logRotator class="hudson.tasks.LogRotator">
-    <daysToKeep>90</daysToKeep>
-    <numToKeep>90</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -82,9 +82,7 @@
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
           <configs>
-            <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
-              <properties>SCHEDULED_TRIGGER=TRUE</properties>
-            </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
+            <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
           </configs>
           <projects>git_deploy_with_deployer</projects>
           <condition>ALWAYS</condition>

=== modified file 'deployment/jobs/trigger_by_branch_scanner/config.xml'
--- deployment/jobs/trigger_by_branch_scanner/config.xml	2015-05-17 14:36:21 +0000
+++ deployment/jobs/trigger_by_branch_scanner/config.xml	2015-08-28 16:23:16 +0000
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <project>
   <actions/>
-  <description>* Automatically checks branches every 30 minutes, trigger jobs if changes are found.&#xd;
-* Can be manually triggered with various parameters for manual test chain or deployment kick off.&#xd;
-* Deployment jobs trigger positive if ANY branch defined in mappings.yaml has a change.&#xd;
-* Amulet &amp; lint jobs trigger positive if specific branches defined in mappings.yaml have a change.&#xd;
-* Calls external python routine, reading branch list from ubuntu-openstack-ci/populate/mappings.yaml.&#xd;
-* Creates properties files for job triggers.&#xd;
-* Additionally, if there are branch revisions, or new branches, a flat file is created at $HOME/state/branch-state.changed, with 1 LP:branch per line, can be parsed by jobs if necessary.</description>
+  <description>* Automatically checks branches every 30 minutes, trigger jobs if revision changes are found.&lt;br/&gt;&#xd;
+* Can be manually triggered with various parameters for manual test chain or deployment kick off.&lt;br/&gt;&#xd;
+* Deployment jobs trigger positive if ANY branch defined in mappings.yaml has a change.&lt;br/&gt;&#xd;
+* Amulet &amp; lint jobs trigger positive if specific branches defined in mappings.yaml have a change.&lt;br/&gt;&#xd;
+* Calls external python routine, reading branch list from ubuntu-openstack-ci/populate/mappings.yaml.&lt;br/&gt;&#xd;
+* Creates properties files for job triggers.&lt;br/&gt;&#xd;
+* Additionally, if there are branch revisions, or new branches, a flat file is created at $HOME/state/branch-state.changed, with 1 LP:branch per line, can be parsed by jobs if necessary.&lt;br/&gt;</description>
   <logRotator class="hudson.tasks.LogRotator">
     <daysToKeep>-1</daysToKeep>
-    <numToKeep>480</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -61,10 +61,8 @@
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
       <maxConcurrentTotal>1</maxConcurrentTotal>
-      <categories/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
-      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>

=== added directory 'deployment/jobs/trigger_by_mojo_group'
=== added file 'deployment/jobs/trigger_by_mojo_group/config.xml'
--- deployment/jobs/trigger_by_mojo_group/config.xml	1970-01-01 00:00:00 +0000
+++ deployment/jobs/trigger_by_mojo_group/config.xml	2015-08-28 16:23:16 +0000
@@ -0,0 +1,152 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>Green/Red dots here do NOT indicate pass/fail of the actual deployments.  That just means the trigger succeeded or failed.</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>480</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>TRIGGER_FINGER</name>
+          <description>&quot;ALL&quot; triggers will result in a TON of jobs, use with intent and caution.&lt;br/&gt;
+&quot;HOT&quot; filters to &quot;distro&quot; and most recent release of OpenStack, for the most recent Ubuntu LTS, and the current dev version of Ubuntu.  All other combos are ignored.&lt;br/&gt;</description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>HOT_NEXT_AND_STABLE_VIRTUAL_DEPLOY</string>
+              <string>HOT_NEXT_DEPLOY</string>
+              <string>HOT_STABLE_DEPLOY</string>
+              <string></string>
+              <string>HOT_METAL</string>
+              <string></string>
+              <string>HOT_NEXT_DEPLOY_BAREMETAL</string>
+              <string>HOT_STABLE_DEPLOY_BAREMETAL</string>
+              <string></string>
+              <string>HOT_NEXT_CHARMHELPER_SYNC</string>
+              <string>HOT_NEXT_CHARMHELPER_HA_SYNC</string>
+              <string></string>
+              <string>HOT_CHARM_UPGRADE</string>
+              <string>HOT_CHARM_UPGRADE_HA</string>
+              <string></string>
+              <string>HOT_OBJECT_STORAGE</string>
+              <string></string>
+              <string># All will be massive, use with intent and caution.</string>
+              <string>HOT_ALL</string>
+              <string>ALL</string>
+              <string>NEXT_ALL</string>
+              <string>STABLE_ALL</string>
+              <string>ICEHOUSE_ALL</string>
+              <string>JUNO_ALL</string>
+              <string>KILO_ALL</string>
+              <string>LIBERTY_ALL</string>
+              <string>PRECISE_ALL</string>
+              <string>TRUSTY_ALL</string>
+              <string>VIVID_ALL</string>
+              <string>WILY_ALL</string>
+              <string></string>
+              <string>CHARM_UPGRADE</string>
+              <string>CHARM_UPGRADE_HA</string>
+              <string>NEXT_DEPLOY</string>
+              <string>NEXT_DEPLOY_SSL</string>
+              <string>NEXT_DEPLOY_BAREMETAL</string>
+              <string>NEXT_CHARMHELPER_SYNC</string>
+              <string>NEXT_CHARMHELPER_HA_SYNC</string>
+              <string>STABLE_DEPLOY</string>
+              <string>STABLE_DEPLOY_BAREMETAL</string>
+              <string>STABLE_CHARMHELPER_UPGRADE</string>
+              <string>STABLE_CHARMHELPER_HA_UPGRADE</string>
+              <string>OBJECT_STORAGE</string>
+              <string>HA_PHASED</string>
+              <string>HA_PHASED_CHAOS_PONY</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>JUJU_SOURCE</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
+      <autoRebuild>false</autoRebuild>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
+      <maxConcurrentPerNode>1</maxConcurrentPerNode>
+      <maxConcurrentTotal>4</maxConcurrentTotal>
+      <throttleEnabled>true</throttleEnabled>
+      <throttleOption>project</throttleOption>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+    <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>master || slave</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>true</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>true</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>true</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash -ex
+${OSCI_ROOT}/job-parts/trigger_by_mojo_group.sh</command>
+    </hudson.tasks.Shell>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
+          </configs>
+          <configFactories>
+            <hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+              <filePattern>mojo-properties.*</filePattern>
+              <noFilesFoundAction>SKIP</noFilesFoundAction>
+            </hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+          </configFactories>
+          <projects>mojo_runner</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs class="empty-list"/>
+          <configFactories>
+            <hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+              <filePattern>baremetal-mojo-properties.*</filePattern>
+              <noFilesFoundAction>SKIP</noFilesFoundAction>
+            </hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+          </configFactories>
+          <projects>mojo_runner_baremetal</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*</artifacts>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <onlyIfSuccessful>false</onlyIfSuccessful>
+      <fingerprint>true</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+    </hudson.tasks.ArtifactArchiver>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
+      <template>#${BUILD_NUMBER} ${ENV,var=&quot;TRIGGER_FINGER&quot;}</template>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== modified file 'deployment/jobs/trigger_by_mp_scanner/config.xml'
--- deployment/jobs/trigger_by_mp_scanner/config.xml	2015-05-17 14:36:21 +0000
+++ deployment/jobs/trigger_by_mp_scanner/config.xml	2015-08-28 16:23:16 +0000
@@ -6,9 +6,9 @@
 </description>
   <logRotator class="hudson.tasks.LogRotator">
     <daysToKeep>-1</daysToKeep>
-    <numToKeep>480</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>150</artifactDaysToKeep>
+    <artifactNumToKeep>1500</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -52,10 +52,8 @@
     <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
       <maxConcurrentPerNode>1</maxConcurrentPerNode>
       <maxConcurrentTotal>1</maxConcurrentTotal>
-      <categories/>
       <throttleEnabled>true</throttleEnabled>
       <throttleOption>project</throttleOption>
-      <configVersion>1</configVersion>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
     <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
   </properties>

=== renamed file 'charm-helpers.yaml' => 'dev/charm-helpers.yaml'
=== modified file 'dev/mappings-dev.yaml'
--- dev/mappings-dev.yaml	2015-07-08 19:44:46 +0000
+++ dev/mappings-dev.yaml	2015-08-28 16:23:16 +0000
@@ -3,29 +3,48 @@
 
 # the openstack version which shipped with an ubuntu release
 # not used by OSCI code yet
-release-map:
+u-os-dlft-rls:
   precise: essex
   trusty: icehouse
   utopic: juno
   vivid: kilo
   wily: liberty
 
-# openstack versions available to ubuntu releases via ubuntu cloudarchives
-# not used by OSCI code yet
-uca-map:
+# ubuntu-to-openstack supported release map
+u-os-map:
   precise:
   - icehouse
   trusty:
+  - icehouse
   - juno
-  - vivid
+  - kilo
+  - liberty
+  vivid:
+  - kilo
+  wily:
   - liberty
 
 # openstack installation sources
-# not used by OSCI code yet
 installation-sources:
   - default
+  - staging
   - proposed
-  - trunk
+
+# (u-os-map x inst-sources) gets applied and iterated to each mojo group:
+mojo-spec-groups:
+  - full_stack:
+#    - charmhelper_upgrade
+#    - charmhelper_upgrade_ha
+#    - ha_phased
+#    - ha_phased_chaos_pony
+#    - next_deploy
+    - next_deploy_baremetal
+#    - next_deploy_ssl
+#    - stable_deploy
+    - stable_deploy_baremetal
+#    - stable_to_next
+#    - stable_to_next_ha
+
 
 
 #

=== renamed file 'populate.py' => 'dev/populate.py'
=== renamed file 'scan_url_group.py' => 'dev/scan_url_group.py'
=== renamed file 'job-parts/trigger_watch_juju_proposed.sh' => 'dev/trigger_watch_juju_proposed.sh'
=== renamed file 'job-parts/build_mojo_runner_baremetal.sh' => 'job-parts/Z_DEPRECATE_build_mojo_runner_baremetal.sh'
--- job-parts/build_mojo_runner_baremetal.sh	2015-07-17 18:16:16 +0000
+++ job-parts/Z_DEPRECATE_build_mojo_runner_baremetal.sh	2015-08-28 16:23:16 +0000
@@ -14,8 +14,7 @@
 [[ -z "$OPENSTACK_CHARM_TESTING_REPO" ]] && export OPENSTACK_CHARM_TESTING_REPO="lp:openstack-charm-testing"
 [[ -z "$OPENSTACK_CHARM_TESTING_ROOT" ]] && export OPENSTACK_CHARM_TESTING_ROOT="${HOME}/tools/openstack-charm-testing"
 
-#[[ -z "$MOJO_OPENSTACK_SPECS_REPO" ]] && export MOJO_OPENSTACK_SPECS_REPO="lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs"
-[[ -z "$MOJO_OPENSTACK_SPECS_REPO" ]] && export MOJO_OPENSTACK_SPECS_REPO="lp:~1chb1n/openstack-mojo-specs/baremetal-bundle-constrainer"
+[[ -z "$MOJO_OPENSTACK_SPECS_REPO" ]] && export MOJO_OPENSTACK_SPECS_REPO="lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs"
 
 [[ -z "$MOJO_SERIES" ]] && export MOJO_SERIES="trusty"
 [[ -z "$MOJO_SPEC" ]] && export MOJO_SPEC="specs/full_stack/next_deploy_baremetal/icehouse"

=== modified file 'job-parts/build_deployer_quickcheck.sh'
--- job-parts/build_deployer_quickcheck.sh	2015-05-14 15:56:01 +0000
+++ job-parts/build_deployer_quickcheck.sh	2015-08-28 16:23:16 +0000
@@ -22,7 +22,7 @@
 f_line "Confirm deployment"
 juju_ok="$(${OSCI_ROOT}/job-parts/juju_deploy_ok.sh || true)"
 echo $juju_ok
-f_juju_status_health_check
+f_juju_status_health_check "-post-deploy"
 
 if [[ "$juju_ok" == *DEPLOYED:* ]]; then
   echo " . Juju deployment succeeded."

=== modified file 'job-parts/build_juju_deploy_single_charm.sh'
--- job-parts/build_juju_deploy_single_charm.sh	2015-04-02 16:17:25 +0000
+++ job-parts/build_juju_deploy_single_charm.sh	2015-08-28 16:23:16 +0000
@@ -29,7 +29,7 @@
 
 # Confirm
 f_line "Confirm deployment"
-f_juju_status_health_check
+f_juju_status_health_check "-post-deploy"
 
 if [[ "$ready" != *DEPLOYED:* ]]; then
   echo "Juju deployment not ready."

=== modified file 'job-parts/build_mojo_runner.sh'
--- job-parts/build_mojo_runner.sh	2015-01-28 15:39:10 +0000
+++ job-parts/build_mojo_runner.sh	2015-08-28 16:23:16 +0000
@@ -1,26 +1,59 @@
 #!/bin/bash -e
-#  Mojo runner for OSCI
-test="mojo"
+#  Mojo runner for UOSCI
+
+# Define defaults for manual runs outside of a Jenkins environment
+#[[ -z "$" ]] && export =""
+[[ -z "$JENKINS_HOME" ]] && export JENKINS_HOME="$HOME"
+[[ -z "$WORKSPACE" ]] && export WORKSPACE="$(mktemp -d)"
+[[ -z "$BUILD_NUMBER" ]] && export BUILD_NUMBER="manual"
+
+[[ -z "$OSCI_REPO" ]] && export OSCI_REPO="lp:ubuntu-openstack-ci"
+[[ -z "$OSCI_ROOT" ]] && export OSCI_ROOT="${HOME}/tools/ubuntu-openstack-ci"
+
+[[ -z "$OPENSTACK_CHARM_TESTING_REPO" ]] && export OPENSTACK_CHARM_TESTING_REPO="lp:openstack-charm-testing"
+[[ -z "$OPENSTACK_CHARM_TESTING_ROOT" ]] && export OPENSTACK_CHARM_TESTING_ROOT="${HOME}/tools/openstack-charm-testing"
+
+# /!\ Temporary override for spec dev
+[[ -z "$MOJO_OPENSTACK_SPECS_REPO" ]] && export MOJO_OPENSTACK_SPECS_REPO="lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs"
+
+[[ -z "$MOJO_SERIES" ]] && export MOJO_SERIES="trusty"
+[[ -z "$MOJO_SPEC" ]] && export MOJO_SPEC="specs/full_stack/next_deploy_baremetal/icehouse"
+
+# Avoid environment teardown if run outside of a Jenkins environment
+[[ -z "$BUILD_URL" ]] && export NO_POST_DESTROY="true"
 
 # Source the common functions
 . ${OSCI_ROOT}/job-parts/osci_job_common.sh
 
 # Set common, constant mojo workspace and project names
-MOJO_WORKSPACE_NAME="osci-mojo"
-MOJO_PROJ="mojo-openstack-specs"
+export MOJO_WORKSPACE_NAME="osci-mojo"
+export MOJO_PROJ="mojo-openstack-specs"
 
 # Prep environment
 f_fresh_clean_start
 f_env_no_pass
 f_mojo_install
 
-# Mojo Go!
 f_line "validating mojo runner env vars"
 f_mojo_handle_env_vars
 
 f_line "bootstrapping"
 f_juju_get_pkg_info juju-pkg-info.txt
-f_juju_bootstrap
+
+if [[ "$MOJO_SPEC" == *metal* ]]; then
+  # Handle baremetal specs
+  export UOSCI_JUJU_TAGS="arch=amd64 tags=uosci"
+#  enviro switcher now handles metal detection
+#  juju switch maas-${MOJO_SERIES}
+  juju bootstrap --upload-tools --constraints="${UOSCI_JUJU_TAGS}" 2>&1 | tee $WORKSPACE/juju-bootstrap.$BUILD_NUMBER
+  if [[ "${PIPESTATUS[0]}" != "0" ]]; then
+    echo " ! Bootstrap failed."
+    touch $WORKSPACE/fyi-${test:0:4}.${test}-bootstrap.failed
+  fi
+else
+  # Not baremetal
+  f_juju_bootstrap
+fi
 
 f_line "defining new mojo project"
 f_mojo_new_project

=== modified file 'job-parts/collect_charm_revno_info.sh'
--- job-parts/collect_charm_revno_info.sh	2015-01-21 22:47:28 +0000
+++ job-parts/collect_charm_revno_info.sh	2015-08-28 16:23:16 +0000
@@ -4,6 +4,8 @@
 [[ -z "$CHARM_SET" ]] && CHARM_SET="next.yaml"
 [[ -z "$UBUNTU_RELEASE" ]] && UBUNTU_RELEASE="trusty"
 [[ -z "$WORKSPACE" ]] && export WORKSPACE="$(mktemp -d)"
+[[ -z "$JENKINS_HOME" ]] && export JENKINS_HOME="$(mktemp -d)"
+[[ -z "$CO_DIR" ]] && CO_DIR="${JENKINS_HOME}/checkout/${BASE_NAME}"
 [[ -z "$BUILD_NUMBER" ]] && export BUILD_NUMBER="unknown"
 [[ -z "$OSCI_ROOT" ]] && export OSCI_ROOT="${HOME}/tools/ubuntu-openstack-ci"
 [[ -z "$OPENSTACK_CHARM_TESTING_ROOT" ]] && export OPENSTACK_CHARM_TESTING_ROOT="${HOME}/tools/openstack-charm-testing"
@@ -11,4 +13,4 @@
 # Source the common functions
 . ${OSCI_ROOT}/job-parts/osci_job_common.sh
 
-f_collect_charm_revnos
+f_collect_asset_revnos

=== modified file 'job-parts/juju_bighammer_destroy.sh'
--- job-parts/juju_bighammer_destroy.sh	2015-01-28 06:06:57 +0000
+++ job-parts/juju_bighammer_destroy.sh	2015-08-28 16:23:16 +0000
@@ -54,7 +54,7 @@
 f_get_env_files
 f_get_my_nova_instances
 tries=0
-while [[ -n "$env_files" ]] || [[ -n "$my_instances" ]] && [ $tries -le 10 ]
+while [[ -n "$env_files" ]] || [[ -n "$my_instances" ]] && [ $tries -le 20 ]
 do
   echo "Waiting for destroy..."
   sleep 12

=== modified file 'job-parts/juju_deploy_ok.sh'
--- job-parts/juju_deploy_ok.sh	2015-07-23 16:15:55 +0000
+++ job-parts/juju_deploy_ok.sh	2015-08-28 16:23:16 +0000
@@ -31,9 +31,10 @@
   juju stat --format=tabular &> $WORKSPACE/juju-stat-bad-states.$BUILD_NUMBER || true
   exit 2
 elif [[ -n $bad_states ]] && [[ -z "$jenvs" ]]; then
-  echo "! TEARDOWN-NEEDED:  Juju environment, agent and/or instance states are bad, and Juju jenv file(s) do not exist for ${JENV_NAME}."
+  msg="! TEARDOWN-NEEDED:  Juju environment, agent and/or instance states are bad, and Juju jenv file(s) do not exist for ${JENV_NAME}."
   echo $bad_states
-  exit 3
+  while true; do echo "ERROR 3 - Manual intervention required.  Undercloud issue?  ${msg}"; sleep 120; done
+#  exit 3
 elif [[ -z $bad_states ]] && [[ -n "$jenvs" ]] && [[ -z $bad_instances ]] && [[ -n $good_instances ]]; then
   echo " . DEPLOYED:  Juju environment, agent and instance states are good, and Juju jenv file(s) exist for ${JENV_NAME}."
   exit 0
@@ -41,16 +42,17 @@
   echo " . CLEAR:  Juju environment, agent and instance states not found, and Juju jenv file(s) do not exist for ${JENV_NAME}."
   exit 0
 elif [[ -z $good_instances ]] && [[ -z $bad_instances ]] && [[ -n "$jenvs" ]]; then
-  echo " ! TEARDOWN-NEEDED:  Funky state!  Juju jenv file(s) exist, but there are no instances, and no bootstrapped environment for:  ${JENV_NAME}."
+  msg=" ! TEARDOWN-NEEDED:  Funky state!  Juju jenv file(s) exist, but there are no instances, and no bootstrapped environment for:  ${JENV_NAME}."
   echo "jenvs: ${jenvs}"
-  exit 4
+  while true; do echo "ERROR 4 - Manual intervention required.  Undercloud issue?  ${msg}"; sleep 120; done
+#  exit 4
 else
-  echo " ! FAIL:  Unknown state, need to debug or troubleshoot this node.  Env name: ${JENV_NAME}"
-  echo "          Possibly a non-default juju environment deployed?"
+  msg=" ! FAIL:  Unknown state, need to debug or troubleshoot this node.  Env name: ${JENV_NAME}.  Possibly a non-default juju environment deployed?"
   echo "1: ${JENV_NAME}"
   echo "2: ${bad_instances}"
   echo "3: ${good_instances}"
   echo "4: ${bad_states}"
   echo "5: ${jenvs}"
-  exit 5
+  while true; do echo "ERROR 5 - Manual intervention required.  Undercloud issue?  ${msg}"; sleep 120; done
+#  exit 5
 fi

=== modified file 'job-parts/osci_job_common.sh'
--- job-parts/osci_job_common.sh	2015-07-24 18:13:21 +0000
+++ job-parts/osci_job_common.sh	2015-08-28 16:23:16 +0000
@@ -13,23 +13,42 @@
 function f_juju_determine_env_name() {
 # determine juju environment name to run with
   juju_enviro_file="${HOME}/.juju/environments.yaml"
-  case "$JUJU_SOURCE" in
-    $JUJU_STABLE)
-      JENV_NAME="$(grep '^default:' ${juju_enviro_file} | cut -f2 -d ':' | xargs)"
-      ;;
-    $JUJU_PROPOSED)
-      JENV_NAME="$(grep '.jprop:$' ${juju_enviro_file} | cut -f1 -d ':' | xargs)"
-      ;;
-    $JUJU_DEVEL)
-      JENV_NAME="$(grep '.jdev:$' ${juju_enviro_file} | cut -f1 -d ':' | xargs)"
-      ;;
-    *)
-      echo " ! Unknown JUJU_SOURCE value while determining jenv name."
-      exit 1
-      ;;
-  esac
-
-  # TO-DO: Insert MAAS env detection here.
+  if [[ "$MOJO_SPEC" != *metal* ]]; then
+    # Not bare metal
+    case "$JUJU_SOURCE" in
+      $JUJU_STABLE)
+        JENV_NAME="$(grep '^default:' ${juju_enviro_file} | head -n1 | cut -f2 -d ':' | xargs)"
+        ;;
+      $JUJU_PROPOSED)
+        JENV_NAME="$(grep '.jprop:$' ${juju_enviro_file} | head -n1 | cut -f1 -d ':' | xargs)"
+        ;;
+      $JUJU_DEVEL)
+        JENV_NAME="$(grep '.jdev:$' ${juju_enviro_file} | head -n1 | cut -f1 -d ':' | xargs)"
+        ;;
+      *)
+        echo " ! Unknown JUJU_SOURCE value while determining jenv name."
+        exit 1
+        ;;
+    esac
+  else
+    # Bare metal
+    echo " . Handling juju environment switcher for bare metal..."
+    case "$JUJU_SOURCE" in
+      $JUJU_STABLE)
+        JENV_NAME="$(grep "maas-${MOJO_SERIES}:$" ${juju_enviro_file} | head -n1 | cut -f1 -d ':' | xargs)"
+        ;;
+      $JUJU_PROPOSED)
+        JENV_NAME="$(grep .jprop:$ ${juju_enviro_file} | grep "maas-${MOJO_SERIES}" | head -n1 | cut -f1 -d ':' | xargs)"
+        ;;
+      $JUJU_DEVEL)
+        JENV_NAME="$(grep .jdev:$ ${juju_enviro_file} | grep "maas-${MOJO_SERIES}" | head -n1 | cut -f1 -d ':' | xargs)"
+        ;;
+      *)
+        echo " ! Unknown JUJU_SOURCE value while determining jenv name."
+        exit 1
+        ;;
+    esac
+  fi
 
   # Validate as non-empty
   if [[ -z "$JENV_NAME" ]]; then
@@ -52,20 +71,21 @@
   case "$ret_code" in
     0)
       echo " . FYI - Deployment health (${PARAM1}) OK.";
-# Temporarily non-gating due to https://bugs.launchpad.net/bugs/1413540.
-#      touch $WORKSPACE/fyi.deploy-health${PARAM1}.ok;
+      touch $WORKSPACE/fyi.deploy-health${PARAM1}.ok;
       ;;
     *)
-      echo " ! FYI - Deployment health (${PARAM1}) BAD.";
-# Temporarily non-gating due to https://bugs.launchpad.net/bugs/1413540.
-#      touch $WORKSPACE/fyi.deploy-health${PARAM1}.failed;
+      # Suppress error if running in the collection phase
+      if [[ "$PARAM1" != "-collect" ]]; then
+        echo " ! FYI - Deployment health (${PARAM1}) BAD.";
+        touch $WORKSPACE/fyi.deploy-health${PARAM1}.failed;
+      fi
       ;;
    esac
 }
 
 
 function f_node_sys_info() {
-  echo "General node system info:"
+  f_line "General node system info"
   lsb_release -d
   uname -a
   uptime
@@ -124,6 +144,7 @@
     f_juju_source_set
     ${OSCI_ROOT}/job-parts/juju_bighammer_destroy.sh YES
     f_lxc_destroy_all
+    f_mojo_broom
   fi
 }
 
@@ -146,6 +167,7 @@
     f_lxc_destroy_all
     ${OSCI_ROOT}/job-parts/juju_bighammer_destroy.sh YES
     f_juju_source_reset
+    f_mojo_broom
   fi
   f_juju_get_pkg_info juju-pkg-info-end.txt
 }
@@ -166,9 +188,8 @@
 function f_post_mp_comment() {
 # Post mp comment if triggered by a merge proposal
   if [[ -n "$MP_TRIGGER" ]]; then
-    # Dry run, debug enabled, ftm.
     cd $OSCI_ROOT
-    ./mp_comment.py || true
+    tools/mp_comment.py || true
   fi
 }
 
@@ -254,7 +275,7 @@
   q_sstring_l=( "${sstring[@]/#/\"}" )
   q_sstring=( "${q_sstring_l[@]/%/\"}" )
   echo " . Running test from Makefile."
-  cmd='${OSCI_ROOT}/make_exec.py Makefile '"${q_sstring[*]}"' 2>&1 | tee $WORKSPACE/${test}-test.$BUILD_NUMBER; ret_code=${PIPESTATUS[0]}'
+  cmd='${OSCI_ROOT}/tools/make_exec.py Makefile '"${q_sstring[*]}"' 2>&1 | tee $WORKSPACE/${test}-test.$BUILD_NUMBER; ret_code=${PIPESTATUS[0]}'
   echo $cmd
   eval $cmd
   echo "Returned:  ${ret_code}"
@@ -386,22 +407,31 @@
 }
 
 
-function f_collect_charm_revnos() {
+function f_collect_asset_revnos() {
 # Collect charm branch revno info from O-C-T path
-  echo "Collecting charm revno info (${tmp_file})..."
-  [[ ! -d "$OPENSTACK_CHARM_TESTING_ROOT" ]] && { echo "Skipping, dir not found: ${OPENSTACK_CHARM_TESTING_ROOT}"; exit 0; }
-
-  revno="$(bzr revno ${OPENSTACK_CHARM_TESTING_ROOT} || true)"
-  echo "${OPENSTACK_CHARM_TESTING_ROOT}: ${revno}" | tee -a $WORKSPACE/charm-revnos.txt.$BUILD_NUMBER
-  bzr info ${OPENSTACK_CHARM_TESTING_ROOT}/${UBUNTU_RELEASE}/${c} | egrep 'root|branch|checkout' | tee -a $WORKSPACE/charm-revnos.txt.$BUILD_NUMBER
-  echo -e "\n" | tee -a $WORKSPACE/charm-revnos.txt.$BUILD_NUMBER
-
-  [[ ! -d "${OPENSTACK_CHARM_TESTING_ROOT}/${UBUNTU_RELEASE}" ]] && { echo "Skipping charm revno collect, series dir not found."; exit 0; }
-  for c in $(ls ${OPENSTACK_CHARM_TESTING_ROOT}/${UBUNTU_RELEASE} -1); do
-    revno="$(bzr revno ${OPENSTACK_CHARM_TESTING_ROOT}/${UBUNTU_RELEASE}/${c} || true)"
-    echo "${c}: ${revno}" 2>&1 | tee -a $WORKSPACE/charm-revnos.txt.$BUILD_NUMBER
-    bzr info ${OPENSTACK_CHARM_TESTING_ROOT}/${UBUNTU_RELEASE}/${c} | egrep 'checkout of branch' | tee -a $WORKSPACE/charm-revnos.txt.$BUILD_NUMBER
-  done
+  f_line "Collecting asset revno info"
+
+  if [[ -n "$CO_DIR" ]]; then
+    revno="$(bzr revno ${CO_DIR} || true)"
+    echo "${CO_DIR}: ${revno}" | tee -a $WORKSPACE/revnos.txt.$BUILD_NUMBER
+    bzr info ${CO_DIR} | egrep 'root|branch|checkout' | tee -a $WORKSPACE/revnos.txt.$BUILD_NUMBER
+    echo -e "\n" | tee -a $WORKSPACE/revnos.txt.$BUILD_NUMBER
+  fi
+
+  if [[ -d "${OPENSTACK_CHARM_TESTING_ROOT}/${UBUNTU_RELEASE}" ]]; then
+    revno="$(bzr revno ${OPENSTACK_CHARM_TESTING_ROOT} || true)"
+    echo "${OPENSTACK_CHARM_TESTING_ROOT}: ${revno}" | tee -a $WORKSPACE/revnos.txt.$BUILD_NUMBER
+    bzr info ${OPENSTACK_CHARM_TESTING_ROOT} | egrep 'root|branch|checkout' | tee -a $WORKSPACE/revnos.txt.$BUILD_NUMBER
+    echo -e "\n" | tee -a $WORKSPACE/revnos.txt.$BUILD_NUMBER
+
+    for c in $(ls ${OPENSTACK_CHARM_TESTING_ROOT}/${UBUNTU_RELEASE} -1); do
+      revno="$(bzr revno ${OPENSTACK_CHARM_TESTING_ROOT}/${UBUNTU_RELEASE}/${c} || true)"
+      echo "${c}: ${revno}" 2>&1 | tee -a $WORKSPACE/revnos.txt.$BUILD_NUMBER
+      bzr info ${OPENSTACK_CHARM_TESTING_ROOT}/${UBUNTU_RELEASE}/${c} | egrep 'checkout of branch' | tee -a $WORKSPACE/revnos.txt.$BUILD_NUMBER
+    done
+  else
+    echo " ! Skipping o-c-t/series/charm revno inspection, does not exist: ${OPENSTACK_CHARM_TESTING_ROOT}/${UBUNTU_RELEASE}"
+  fi
 }
 
 
@@ -413,6 +443,7 @@
   juju-deployer
   amulet
   charm-tools
+  mojo
   python-amqp
   python-ceilometerclient
   python-cinderclient

=== modified file 'job-parts/osci_mojo_common.sh'
--- job-parts/osci_mojo_common.sh	2015-03-03 16:49:06 +0000
+++ job-parts/osci_mojo_common.sh	2015-08-28 16:23:16 +0000
@@ -2,6 +2,14 @@
 #
 #  Common functions for UOSCI jobs, specific to mojo functionality.
 
+function f_mojo_broom() {
+  if [[ -d "/srv/mojo/mojo-openstack-specs/" ]]; then
+    echo " - Purging /srv/mojo/mojo-openstack-specs ..."
+    rm -rf /srv/mojo/mojo-openstack-specs/*
+  fi
+}
+
+
 function f_mojo_install() {
 # Install or upgrade mojo
   echo "Installing or upgrading mojo..."
@@ -12,6 +20,8 @@
     echo " ! Mojo install failed."
     exit 1
   fi
+  echo "Mojo verison:"
+  mojo --version
 }
 
 
@@ -22,8 +32,8 @@
     touch $WORKSPACE/fyi-${test:0:4}.mojo-project-new.skipped
   else
     set -x
-    sudo -E mojo project-new --series ${MOJO_SERIES} ${MOJO_PROJ} \
-        2>&1 | tee $WORKSPACE/mojo-project-new.$BUILD_NUMBER
+    sudo -E mojo project-new --series ${MOJO_SERIES} \
+        --container containerless ${MOJO_PROJ} 2>&1 | tee $WORKSPACE/mojo-project-new.$BUILD_NUMBER
     # Error trap
     if [[ "${PIPESTATUS[0]}" != "0" ]]; then
       echo " ! Failed to create new mojo project."
@@ -37,8 +47,8 @@
 function f_mojo_perms_workaround() {
 # Workaround for bug https://bugs.launchpad.net/mojo/+bug/1346873
   set -x
-  sudo chmod 755 /var/lib/lxc/${MOJO_PROJ}.${MOJO_SERIES}
-  sudo chmod 755 /var/lib/lxc
+  sudo chmod 755 /var/lib/lxc/${MOJO_PROJ}.${MOJO_SERIES} || true
+  sudo chmod 755 /var/lib/lxc || true
   set +x
 }
 
@@ -46,7 +56,7 @@
 function f_mojo_new_workspace() {
 # Add mojo workspace.
   if [[ -n "$(ls $WORKSPACE -1 | egrep '.failed|.bad')" ]]; then
-    echo " ! Skipping mojo workspacet-new, one or more preceding steps are failed or bad."
+    echo " ! Skipping mojo workspace-new, one or more preceding steps are failed or bad."
     touch $WORKSPACE/fyi-${test:0:4}.mojo-workspace-new.skipped
   else
     set -x
@@ -93,14 +103,15 @@
     echo " - Destroying all lxc containers:"
     for container in "$(sudo lxc-ls -1)"; do
       echo " -   ${container}"
-      sudo lxc-destroy --name ${container}
+      sudo lxc-destroy --name ${container} --force || true
+      sudo lxc-destroy --name ${container} --force || true
     done
 
     # Confirm
-    lxc_ls="$(sudo lxc-ls -1)"
-    if [[ -n "$lxc_ls" ]]; then
-      touch $WORKSPACE/fyi-${test:0:4}.${test}-lxc-destroy.failed
-    fi
+#    lxc_ls="$(sudo lxc-ls -1)"
+#    if [[ -n "$lxc_ls" ]]; then
+#      touch $WORKSPACE/fyi-${test:0:4}.${test}-lxc-destroy.failed
+#    fi
   fi
 }
 

=== modified file 'job-parts/osci_tools_common.sh'
--- job-parts/osci_tools_common.sh	2015-05-01 13:03:11 +0000
+++ job-parts/osci_tools_common.sh	2015-08-28 16:23:16 +0000
@@ -10,6 +10,7 @@
   fi
   echo " + Creating new lightweight checkout of $OSCI_REPO @ $OSCI_ROOT."
   bzr co --lightweight $OSCI_REPO $OSCI_ROOT
+  echo "revno: $(bzr revno $OSCI_ROOT)"
 }
 
 
@@ -21,6 +22,7 @@
   fi
   echo " + Creating new lightweight checkout of $OPENSTACK_CHARM_TESTING_REPO @ $OPENSTACK_CHARM_TESTING_ROOT."
   bzr co --lightweight $OPENSTACK_CHARM_TESTING_REPO $OPENSTACK_CHARM_TESTING_ROOT
+  echo "revno: $(bzr revno $OPENSTACK_CHARM_TESTING_ROOT)"
 }
 
 
@@ -48,6 +50,7 @@
 
 
 function f_tools_refresh() {
+  f_line "Refreshing UOSCI & O-C-T branches..."
   f_tool_refresh_osci
   f_tool_refresh_oct
 }
@@ -62,5 +65,5 @@
     echo " ! Bundletester install failed."
     exit 1
   fi
-f_proxy_unset
+  f_proxy_unset
 }

=== modified file 'job-parts/trigger_by_branch_scanner.sh'
--- job-parts/trigger_by_branch_scanner.sh	2015-01-28 06:06:57 +0000
+++ job-parts/trigger_by_branch_scanner.sh	2015-08-28 16:23:16 +0000
@@ -12,28 +12,28 @@
 
 case "$TRIGGER_FINGER" in
   AUTO)
-    ./scan_branches.py
+    tools/scan_branch_revs.py
     ;;
   AUTO_DRY_RUN)
-    ./scan_branches.py -0 -d
+    tools/scan_branch_revs.py -0 -d
     ;;
   FORCE_AMULET_ONLY)
-    ./scan_branches.py -F -N --XD --XL --XU
+    tools/scan_branch_revs.py -F -N --XD --XL --XU
     ;;
   FORCE_UNIT_ONLY)
-    ./scan_branches.py -F -N --XD --XL --XA
+    tools/scan_branch_revs.py -F -N --XD --XL --XA
     ;;
   FORCE_DEPLOY_ONLY)
-    ./scan_branches.py -F -N --XA --XL --XU
+    tools/scan_branch_revs.py -F -N --XA --XL --XU
     ;;
   FORCE_LINT_ONLY)
-    ./scan_branches.py -F -N --XD --XA --XU
+    tools/scan_branch_revs.py -F -N --XD --XA --XU
     ;;
   FORCE_ALL)
-    ./scan_branches.py -F -N
+    tools/scan_branch_revs.py -F -N
     ;;
   FORCE_ALL_DRY_RUN)
-    ./scan_branches.py -F0d
+    tools/scan_branch_revs.py -F0d
     ;;
   *)
     echo "Unknown trigger option."
@@ -46,7 +46,6 @@
 # Echo build description regex pickup
 if [[ -f $WORKSPACE/branch-state.changed ]]; then
   echo "_:branch-state.changed"
-  cat ${WORKSPACE}/branch-state.changed
 else
   echo "No changes detected."
 fi

=== added file 'job-parts/trigger_by_mojo_group.sh'
--- job-parts/trigger_by_mojo_group.sh	1970-01-01 00:00:00 +0000
+++ job-parts/trigger_by_mojo_group.sh	2015-08-28 16:23:16 +0000
@@ -0,0 +1,144 @@
+#!/bin/bash -e
+#
+# Build script for triggering various groups of mojo specs
+
+. ${OSCI_ROOT}/job-parts/osci_job_common.sh
+f_skip_juju_lxc
+f_fresh_clean_start
+f_env_no_pass
+
+cd $OSCI_ROOT
+
+case "$TRIGGER_FINGER" in
+  HOT_NEXT_AND_STABLE_VIRTUAL_DEPLOY)
+    tools/trigger_mojo_group.py -s stable_deploy -H
+    tools/trigger_mojo_group.py -s next_deploy -H
+    ;;
+  HOT_NEXT_DEPLOY)
+    tools/trigger_mojo_group.py -s next_deploy -H
+    ;;
+  HOT_STABLE_DEPLOY)
+    tools/trigger_mojo_group.py -s stable_deploy -H
+    ;;
+  HOT_METAL)
+    tools/trigger_mojo_group.py -Ls baremetal -H
+    ;;
+  HOT_NEXT_DEPLOY_BAREMETAL)
+    tools/trigger_mojo_group.py -s next_deploy_baremetal -H
+    ;;
+  HOT_STABLE_DEPLOY_BAREMETAL)
+    tools/trigger_mojo_group.py -s stable_deploy_baremetal -H
+    ;;
+  HOT_NEXT_CHARMHELPER_SYNC)
+    tools/trigger_mojo_group.py -s charmhelper_upgrade -H
+    ;;
+  HOT_NEXT_CHARMHELPER_HA_SYNC)
+    tools/trigger_mojo_group.py -s charmhelper_upgrade_ha -H
+    ;;
+  HOT_CHARM_UPGRADE)
+    tools/trigger_mojo_group.py -s stable_to_next -H
+    ;;
+  HOT_CHARM_UPGRADE_HA)
+    tools/trigger_mojo_group.py -s stable_to_next_ha -H
+    ;;
+  HOT_OBJECT_STORAGE)
+    tools/trigger_mojo_group.py -g object_storage -H
+    ;;
+
+  HOT_ALL)
+    tools/trigger_mojo_group.py
+    ;;
+
+  ALL)
+    tools/trigger_mojo_group.py
+    ;;
+  NEXT_ALL)
+    tools/trigger_mojo_group.py
+    ;;
+  STABLE_ALL)
+    tools/trigger_mojo_group.py
+    ;;
+
+  ICEHOUSE_ALL)
+    tools/trigger_mojo_group.py -o icehouse
+    ;;
+  JUNO_ALL)
+    tools/trigger_mojo_group.py -o juno
+    ;;
+  KILO_ALL)
+    tools/trigger_mojo_group.py -o kilo
+    ;;
+  LIBERTY_ALL)
+    tools/trigger_mojo_group.py -o liberty
+    ;;
+
+  PRECISE_ALL)
+    tools/trigger_mojo_group.py -u precise
+    ;;
+  TRUSTY_ALL)
+    tools/trigger_mojo_group.py -u trusty
+    ;;
+  VIVID_ALL)
+    tools/trigger_mojo_group.py -u vivid
+    ;;
+  WILY_ALL)
+    tools/trigger_mojo_group.py -u wily
+    ;;
+
+  CHARM_UPGRADE)
+    tools/trigger_mojo_group.py
+    ;;
+  CHARM_UPGRADE_HA)
+    tools/trigger_mojo_group.py
+    ;;
+
+  NEXT_DEPLOY)
+    tools/trigger_mojo_group.py -s next_deploy
+    ;;
+  NEXT_DEPLOY_SSL)
+    tools/trigger_mojo_group.py -s next_deploy_ssl
+    ;;
+  NEXT_DEPLOY_BAREMETAL)
+    tools/trigger_mojo_group.py -s next_deploy_baremetal
+    ;;
+  NEXT_CHARMHELPER_SYNC)
+    tools/trigger_mojo_group.py -s charmhelper_upgrade
+    ;;
+  NEXT_CHARMHELPER_HA_SYNC)
+    tools/trigger_mojo_group.py -s charmhelper_upgrade_ha
+    ;;
+
+  STABLE_DEPLOY)
+    tools/trigger_mojo_group.py -s stable_deploy
+    ;;
+  STABLE_DEPLOY_BAREMETAL)
+    tools/trigger_mojo_group.py -s stable_deploy_baremetal
+    ;;
+  STABLE_CHARMHELPER_UPGRADE)
+    tools/trigger_mojo_group.py -s stable_to_next
+    ;;
+  STABLE_CHARMHELPER_HA_UPGRADE)
+    tools/trigger_mojo_group.py -s stable_to_next_ha
+    ;;
+
+  OBJECT_STORAGE)
+    tools/trigger_mojo_group.py -g object_storage
+    ;;
+
+  HA_PHASED)
+    tools/trigger_mojo_group.py -s ha_phased -u trusty
+    tools/trigger_mojo_group.py -s ha_phased -u vivid
+    ;;
+  HA_PHASED_CHAOS_PONY)
+    tools/trigger_mojo_group.py -s ha_phased_chaos_pony -u trusty
+    tools/trigger_mojo_group.py -s ha_phased_chaos_pony -u vivid
+    ;;
+
+  *)
+    echo "Unknown trigger option."
+    exit 1
+    ;;
+esac
+
+f_nice_finish
+f_check_fail

=== modified file 'job-parts/trigger_by_mp_scanner.sh'
--- job-parts/trigger_by_mp_scanner.sh	2015-01-28 06:06:57 +0000
+++ job-parts/trigger_by_mp_scanner.sh	2015-08-28 16:23:16 +0000
@@ -12,28 +12,28 @@
 
 case "$TRIGGER_FINGER" in
   AUTO)
-    ./scan_merge_props.py
+    tools/scan_merge_props.py
     ;;
   AUTO_DRY_RUN)
-    ./scan_merge_props.py -0 -d
+    tools/scan_merge_props.py -0 -d
     ;;
   FORCE_AMULET_ONLY)
-    ./scan_merge_props.py -F -N --XD --XL --XU -d
+    tools/scan_merge_props.py -F -N --XD --XL --XU -d
     ;;
   FORCE_UNIT_ONLY)
-    ./scan_merge_props.py -F -N --XD --XL --XA -d
+    tools/scan_merge_props.py -F -N --XD --XL --XA -d
     ;;
   FORCE_DEPLOY_ONLY)
-    ./scan_merge_props.py -F -N --XA --XL --XU -d
+    tools/scan_merge_props.py -F -N --XA --XL --XU -d
     ;;
   FORCE_LINT_ONLY)
-    ./scan_merge_props.py -F -N --XD --XA --XU -d
+    tools/scan_merge_props.py -F -N --XD --XA --XU -d
     ;;
   FORCE_ALL)
-    ./scan_merge_props.py -F -N -d
+    tools/scan_merge_props.py -F -N -d
     ;;
   FORCE_ALL_DRY_RUN)
-    ./scan_merge_props.py -F0d
+    tools/scan_merge_props.py -F0d
     ;;
   *)
     echo "Unknown trigger option."
@@ -46,7 +46,6 @@
 # Echo build description regex pickup
 if [[ -f $WORKSPACE/mp-state.changed ]]; then
   echo "_:mp-state.changed"
-  cat ${WORKSPACE}/mp-state.changed
 else
   echo "No changes detected."
 fi

=== modified file 'populate/mappings.yaml'
--- populate/mappings.yaml	2015-07-24 18:13:21 +0000
+++ populate/mappings.yaml	2015-08-28 16:23:16 +0000
@@ -21,6 +21,37 @@
   sandbox-lp-branch-url: 'lp:ubuntu-openstack-ci'
   sandbox-mp-url: None
 
+# ubuntu-to-openstack supported release map
+# used to calculate test coverage
+u-os-map:
+  precise:
+  - icehouse
+  trusty:
+  - icehouse
+  - juno
+  - kilo
+#  - liberty
+  vivid:
+  - kilo
+#  wily:
+#  - liberty
+
+# the things we care most about right now
+hot:
+#  precise:
+#  - icehouse
+  trusty:
+  - icehouse
+  - kilo
+  vivid:
+  - kilo
+
+# openstack installation sources
+inst-sources:
+  - default
+  - staging
+  - proposed
+
 # merge proposal status to trigger tests
 mp-status-filter:
  - 'Needs review'
@@ -33,21 +64,25 @@
 # - 'Superseded'
 
 # branches to watch for revision bumps
+# optionally append #NODEPLOY to not trigger deployments
+# Optional tags: #NODEPLOY #NOLINT #NOUNIT #NOAMULET
+# Non-charm branches will not trigger deploy and amulet tests.
+# Charms not used in the next/default bundles are flagged NODEPLOY.
 trigger-branches:
   - lp:~openstack-charmers/charms/trusty/ceilometer-agent/next
   - lp:~openstack-charmers/charms/trusty/ceilometer/next
   - lp:~openstack-charmers/charms/trusty/ceph/next
-  - lp:~openstack-charmers/charms/trusty/ceph-osd/next
-  - lp:~openstack-charmers/charms/trusty/ceph-radosgw/next
+  - lp:~openstack-charmers/charms/trusty/ceph-osd/next#NODEPLOY
+  - lp:~openstack-charmers/charms/trusty/ceph-radosgw/next#NODEPLOY
   - lp:~openstack-charmers/charms/trusty/cinder-ceph/next
   - lp:~openstack-charmers/charms/trusty/cinder/next
   - lp:~openstack-charmers/charms/trusty/glance/next
-  - lp:~openstack-charmers/charms/trusty/hacluster/next
+  - lp:~openstack-charmers/charms/trusty/hacluster/next#NODEPLOY
   - lp:~openstack-charmers/charms/trusty/heat/next
   - lp:~openstack-charmers/charms/trusty/keystone/next
   - lp:~openstack-charmers/charms/trusty/neutron-api/next
   - lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
-  - lp:~openstack-charmers/charms/trusty/nova-cell/next
+  - lp:~openstack-charmers/charms/trusty/nova-cell/next#NODEPLOY
   - lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
   - lp:~openstack-charmers/charms/trusty/nova-compute/next
   - lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
@@ -59,12 +94,12 @@
   - lp:charms/trusty/ceilometer
   - lp:charms/trusty/ceilometer-agent
   - lp:charms/trusty/ceph
-  - lp:charms/trusty/ceph-osd
-  - lp:charms/trusty/ceph-radosgw
+  - lp:charms/trusty/ceph-osd#NODEPLOY
+  - lp:charms/trusty/ceph-radosgw#NODEPLOY
   - lp:charms/trusty/cinder-ceph
   - lp:charms/trusty/cinder
   - lp:charms/trusty/glance
-  - lp:charms/trusty/hacluster
+  - lp:charms/trusty/hacluster#NODEPLOY
   - lp:charms/trusty/heat
   - lp:charms/trusty/keystone
   - lp:charms/trusty/mongodb
@@ -75,11 +110,14 @@
   - lp:charms/trusty/nova-compute
   - lp:charms/trusty/openstack-dashboard
   - lp:charms/trusty/percona-cluster
-  - lp:charms/trusty/quantum-gateway
+#  - lp:charms/trusty/quantum-gateway#NODEPLOY#NOAMULET
   - lp:charms/trusty/rabbitmq-server
   - lp:charms/trusty/swift-proxy
   - lp:charms/trusty/swift-storage
-
+  - lp:ubuntu-openstack-ci#NOUNIT
+  - lp:charms/trusty/ubuntu#NODEPLOY#NOUNIT
+  - lp:charms/trusty/memcached#NODEPLOY
+  - lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs#NOUNIT
 # deployment set to trigger when ANY trigger branch change is detected
 # in relation to deployer bundles in the openstack-charm-testing branch
 trigger-deployments:
@@ -89,7 +127,6 @@
   - trusty-juno
   - trusty-kilo
 #  - trusty-liberty
-#  - utopic-juno
   - vivid-kilo
 #  - wily-liberty
   next.yaml:
@@ -98,7 +135,6 @@
   - trusty-juno
   - trusty-kilo
 #  - trusty-liberty
-#  - utopic-juno
   - vivid-kilo
 #  - wily-liberty
 
@@ -106,11 +142,10 @@
 # the merge-proposed branch will be substituted for the target branch
 mp-trigger-deployments:
   next.yaml:
-  - precise-icehouse
+#  - precise-icehouse
   - trusty-icehouse
-  - trusty-juno
+#  - trusty-juno
   - trusty-kilo
-#  - utopic-juno
   - vivid-kilo
 #  default.yaml:
 # disabled as uosci runner only substitutes next branch strings currently
@@ -118,7 +153,6 @@
 #  - trusty-icehouse
 #  - trusty-juno
 #  - trusty-kilo
-#  - utopic-juno
 #  - vivid-kilo
 
 # controls pass/fail detection for MP commentary
@@ -159,3 +193,24 @@
     - 'fyi-depl.*.failed'
     - 'fyi-depl.*.missing'
 #    - 'fyi-depl.*.bad'
+
+# (u-os-map x inst-sources) gets applied and iterated to each mojo group:
+mojo-spec-groups:
+  full_stack:
+  - charmhelper_upgrade
+  - charmhelper_upgrade_ha
+  - ha_phased
+  - ha_phased_chaos_pony
+  - next_deploy
+  - next_deploy_baremetal
+  - next_deploy_ssl
+  - stable_deploy
+  - stable_deploy_baremetal
+  - stable_to_next
+  - stable_to_next_ha
+  object_storage:
+  - ceph_radosgw/ha
+  - ceph_radosgw/simple_nonha
+  - swift_proxy/ha
+  - swift_proxy/simple_nonha
+

=== added file 'populate/mojo-properties.tmpl'
--- populate/mojo-properties.tmpl	1970-01-01 00:00:00 +0000
+++ populate/mojo-properties.tmpl	2015-08-28 16:23:16 +0000
@@ -0,0 +1,3 @@
+MOJO_SPEC={{mojo_spec}}
+MOJO_SERIES={{mojo_series}}
+DISPLAY_NAME={{display_name}}

=== modified file 'tools/find_replace.py'
--- tools/find_replace.py	2015-07-10 21:11:38 +0000
+++ tools/find_replace.py	2015-08-28 16:23:16 +0000
@@ -78,9 +78,9 @@
             logging.warning('Output file exists and will be '
                             'overwritten: {}'.format(opts.out_file))
         elif os.path.isfile(opts.out_file) and not opts.overwrite:
-            logging.warning('Output file exists and will NOT '
-                            'be overwritten: {}'.format(opts.out_file))
-            raise ValueError('Output file exists, overwrite option not set.')
+            logging.error('Output file exists and will NOT '
+                          'be overwritten: {}'.format(opts.out_file))
+            sys.exit(1)
 
     if opts.in_file:
         if os.path.isfile(opts.in_file):
@@ -106,9 +106,11 @@
                     out_file.writelines(out_lines)
                 logging.info('replaced {} lines'.format(found))
             else:
-                raise ValueError('No matches found, output file not written.')
+                logging.error('No matches found, output file not written.')
+                sys.exit(1)
         else:
-            raise ValueError('Input file not found: {}'.format(opts.in_file))
+            logging.error('Input file not found: {}'.format(opts.in_file))
+            sys.exit(1)
 
 
 if __name__ == '__main__':

=== modified file 'tools/juju_pull_logs.py'
--- tools/juju_pull_logs.py	2015-07-10 21:11:38 +0000
+++ tools/juju_pull_logs.py	2015-08-28 16:23:16 +0000
@@ -4,20 +4,13 @@
   else store in local temp directory.
 '''
 import os
-import subprocess
 import logging
-import tempfile
 import sys
 sys.path.insert(1, os.path.join(sys.path[0], '..'))
-from common import osci_utils
+from common import osci_utils as u
 
 # Set default logging level
-logging.basicConfig(level=logging.INFO)
-
-try:
-    WORKSPACE = os.environ['WORKSPACE']
-except KeyError:
-    WORKSPACE = tempfile.mkdtemp()
+logging.basicConfig(level=logging.DEBUG)
 
 
 def run_cmds(cmds, fatal=False, dry_run=False, suppress=True):
@@ -25,7 +18,7 @@
         due to piping and redirection.
     '''
 
-    if len(cmds) == 0:
+    if not cmds:
         return False
 
     all_passed = True
@@ -39,10 +32,10 @@
             ret = os.system(cmd)
 
         # Handle exit code and fatal flag
-        if fatal and ret != 0:
+        if fatal and ret:
             logging.warn('Aborting on failed command.')
             sys.exit(1)
-        elif not fatal and ret != 0:
+        elif not fatal and ret:
             all_passed = False
             logging.warn('Ignoring failed command.')
 
@@ -57,15 +50,12 @@
     '''
 
     logging.info('Ubuntu OSCI Juju Log Puller')
-    logging.info('Workspace dir: {}'.format(WORKSPACE))
-    pkey = os.path.expanduser('~/.juju/ssh/juju_id_rsa')
+    logging.info('Workspace dir: {}'.format(u.WORKSPACE))
+#    pkey = os.path.expanduser('~/.juju/ssh/juju_id_rsa')
     all_collected = True
 
     # Determine output directory
-    try:
-        log_dir = os.path.join(os.environ['WORKSPACE'], 'logs')
-    except KeyError:
-        log_dir = os.path.join(tempfile.mkdtemp(), 'logs')
+    log_dir = os.path.join(u.WORKSPACE, 'logs')
 
     if not os.path.exists(log_dir):
         os.makedirs(log_dir)
@@ -73,14 +63,22 @@
     logging.info('Logs dir: {}'.format(log_dir))
 
     # Get juju status data
-    try:
-        j_stat = osci_utils.juju_stat()
-    except subprocess.CalledProcessError:
-        logging.error('Could not get juju status.')
+    j_stat = u.juju_stat()
+
+    # Basic jstat data validation
+    if not j_stat:
+        logging.info('No action taken.  Exiting cleanly, '
+                     'presuming not bootstrapped.')
+        sys.exit(0)
+    elif j_stat and 'machines' not in j_stat.keys() or \
+            'services' not in j_stat.keys():
+        logging.error('No juju status data to inspect, although '
+                      'an environment appears to be bootstrapped.')
         sys.exit(1)
 
     # Add bootstrap machine to units dict
     found_bootstrap_node = False
+
     for machine, mach_data in j_stat['machines'].iteritems():
         if 'state-server-member-status' in mach_data:
             if mach_data['state-server-member-status'] == 'has-vote':
@@ -110,14 +108,19 @@
             clean_name = unit.replace('/', '-')
             machine_num = unit_data['machine']
 
-            if 'instance-id' in j_stat['machines'][machine_num]:
+            # Get nova console logs if instance is nova
+            if machine_num in j_stat['machines'] and \
+                    'instance-id' in j_stat['machines'][machine_num]:
                 instance_id = j_stat['machines'][machine_num]['instance-id']
-                cmds.append('nova console-log {} | bzip2 -9z | tee {}/{}'
-                            '-nova-console-{}.bz2'.format(
-                                instance_id,
-                                log_dir,
-                                clean_name,
-                                unit_data['machine']))
+                logging.info('Instance id for {}: {}'.format(machine_num,
+                                                             instance_id))
+                if 'MAAS' not in instance_id:
+                    cmds.append('nova console-log {} | bzip2 -9z | tee {}/{}'
+                                '-nova-console-{}.bz2'.format(
+                                    instance_id,
+                                    log_dir,
+                                    clean_name,
+                                    unit_data['machine']))
 
 # Temporarily disabled
 #            if unit_data['agent-state'] != 'started':
@@ -126,28 +129,38 @@
 #                all_collected = False
 #                continue
 
-            if 'public-address' in unit_data.keys():
+# Check if ssh works before attempting to juju ssh
+# !Buggy! - paramiko old version
+#            if 'public-address' in unit_data.keys():
                 # SSH command check on unit's host address
                 # Don't try to "juju ssh" to a unit that is defunct.
-                host = unit_data['public-address']
-                ret = osci_utils.func_timeout(
-                    timeout=10,
-                    func_call=osci_utils.ssh_command_check,
-                    kwargs={'host': host,
-                            'username': 'ubuntu',
-                            'pkey': pkey})
-
-                if not ret:
-                    logging.warn('SSH command check failed for unit {} ({}), '
-                                 'not pulling its logs.'.format(unit, host))
-                    all_collected = False
-                    continue
+#                host = unit_data['public-address']
+#                logging.info('Host, key:  {}, {}'.format(host, pkey))
+#                ret = u.func_timeout(
+#                    timeout=10,
+#                    func_call=u.ssh_command_check,
+#                    kwargs={'host': host,
+#                            'username': 'ubuntu',
+#                            'pkey': pkey})
+#
+#                if not ret:
+#                    logging.warn('SSH command check failed for unit {} ({}), '
+#                                 'not pulling its logs.'.format(unit, host))
+#                    all_collected = False
+#                    continue
 
             cmds.append('juju ssh {} sudo tar -cjf '
                         '/home/ubuntu/{}-var-log.tar.bz2 /var/log'.format(
                             unit,
                             clean_name))
 
+            cmds.append('juju ssh {} sudo tar -cjf '
+                        '/home/ubuntu/{}-etc.tar.bz2 /etc '
+                        '--exclude="/etc/X11" --exclude="/etc/ssl" '
+                        '--exclude="/etc/ssh" --exclude="shadow"'.format(
+                            unit,
+                            clean_name))
+
             cmds.append('juju ssh {} "dpkg -l | bzip2 -9z > '
                         '/home/ubuntu/{}-dpkg-list.bz2"'.format(unit,
                                                                 clean_name))
@@ -156,19 +169,21 @@
                         ' {}'.format(unit, log_dir))
 
     # Run!
-    fail_me = False
+    failed = False
     ret = run_cmds(cmds, dry_run=False)
 
     # Final validation
     if not ret:
-        logging.error('One or more commands failed')
-        fail_me = True
+        logging.error('One or more commands failed.')
+        failed = True
 
     if not all_collected:
         logging.error('One or more units were not reachable.')
-        fail_me = True
+        failed = True
 
-    if fail_me:
+    if not failed:
+        logging.info('Unit log collection appeared to go well.  Good day.')
+    else:
         sys.exit(1)
 
 

=== renamed file 'make_exec.py' => 'tools/make_exec.py'
--- make_exec.py	2015-04-03 21:39:41 +0000
+++ tools/make_exec.py	2015-08-28 16:23:16 +0000
@@ -4,14 +4,16 @@
 makefile and execute it.
 '''
 
+import collections
 import optparse
 import logging
-import yaml
 import os
+import subprocess
 import sys
-import tempfile
-import subprocess
-from common import osci_utils
+import yaml
+
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
+from common import osci_utils as u
 
 USAGE = '''Usage: %prog [options] MAKEFILENAME STRING1 [STRING2 STRING3]
 
@@ -35,57 +37,49 @@
 '''
 
 
-try:
-    WORKSPACE = os.environ['WORKSPACE']
-except KeyError:
-    WORKSPACE = tempfile.mkdtemp()
-
-
 def makefile_to_dict(file_name):
     '''A rough little Makefile parser, to return a dictionary
     of make targets and subsequent commands.
     '''
 
-    _lines = osci_utils.read_file(file_name)
-    if _lines:
-        if len(_lines) == 0:
-            return False
-    else:
+    # Read the Makefile into a list of lines
+    lines = u.read_file(file_name)
+    if not lines:
         return False
 
+    # Rough Makefile parser
     found_target, found_cmd = False, False
-    _data = {}
-    _cmds = []
-    for _this_line in _lines:
-        _line = _this_line.strip()
-        _target = False
-        if len(_line) != 0 and _line[0] != '#':
-            if _this_line[0] != '\t' and ':' in _line:
+    _d = collections.OrderedDict()
+    cmds = []
+    for this_line in lines:
+        line = this_line.strip()
+        target = False
+        if len(line) != 0 and line[0] != '#':
+            if this_line[0] != '\t' and ':' in line:
                 # Makefile target name found
-                _target = _line.split(':')[0]
-                _cmds = []
+                target = line.split(':')[0]
+                cmds = []
                 found_target = True
-            elif _this_line[0] == '\t':
+            elif this_line[0] == '\t':
                 # Makefile command found
-                _cmds.append(_line)
+                cmds.append(line)
                 found_cmd = True
-        if _target:
+        if target:
             # Add to dict with target name as key
-            _data[_target] = _cmds
+            _d[target] = cmds
 
     if found_target and found_cmd:
-        return _data
+        return _d
     else:
         if not found_target:
-            logging.debug('Found no apparent make target name(s)')
+            logging.debug('Found no make target name(s)')
         if not found_cmd:
-            logging.debug('Found no apparent make target command(s)')
+            logging.debug('Found no target command(s)')
         return False
 
 
 def make_target(target, mf_filename):
-    '''Call make target
-    '''
+    '''Call make target'''
     cmd = 'make -f {} {}'.format(mf_filename, target)
     logging.info('command:  {}'.format(cmd))
     cmd_split = cmd.split(' ')
@@ -105,8 +99,7 @@
 
 
 def main():
-    '''Define and handle command line parameters
-    '''
+    '''Define and handle command line parameters'''
     # Define command line options
     parser = optparse.OptionParser(USAGE)
     parser.add_option("-d", "--debug",
@@ -127,7 +120,7 @@
         logging.debug('parse args: {}'.format(args))
     else:
         logging.basicConfig(level=logging.INFO)
-    logging.info('Workspace dir: {}'.format(WORKSPACE))
+    logging.info('Workspace dir: {}'.format(u.WORKSPACE))
 
     # Validate arguments
     if len(args) < 2:
@@ -136,7 +129,7 @@
         parser.print_help()
         sys.exit(1)
 
-    # Read Makefile into dictionary
+    # Read Makefile into an ordered dictionary
     mf_filename = args[0]
     logging.info('Reading file: {}'.format(mf_filename))
     mf_data = makefile_to_dict(mf_filename)
@@ -149,7 +142,7 @@
         logging.debug('Makefile dict data:\n{}'.format(
             yaml.dump(mf_data, default_flow_style=False)))
 
-    # Search Makefile dict data for string in commands
+    # Search Makefile targets for matching string in commands
     mf_sstrings = args[1:]
     logging.info('Searching for: {}'.format(mf_sstrings))
     tgt_matches = []
@@ -159,10 +152,10 @@
                 if mf_sstring in cmd and target not in tgt_matches:
                     tgt_matches.append(target)
                     break
-    num_matches = len(tgt_matches)
 
     # Handle matches
-    if num_matches != 0:
+    if tgt_matches:
+        num_matches = len(tgt_matches)
         logging.debug('Found {} target match(es), first '
                       'found wins:  {}'.format(num_matches, tgt_matches[0]))
         logging.debug('Matches:\n{}'.format(tgt_matches))

=== renamed file 'mp_comment.py' => 'tools/mp_comment.py'
--- mp_comment.py	2015-01-07 19:32:26 +0000
+++ tools/mp_comment.py	2015-08-28 16:23:16 +0000
@@ -11,7 +11,9 @@
 import sys
 import tempfile
 from glob import glob
-from common import osci_utils
+
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
+from common import osci_utils as u
 
 USAGE = '''Usage: %prog [options]
 
@@ -32,11 +34,6 @@
 
 
 try:
-    WORKSPACE = os.environ['WORKSPACE']
-except KeyError:
-    WORKSPACE = tempfile.mkdtemp()
-
-try:
     MPC_SILENT = os.environ['MPC_SILENT']
 except KeyError:
     MPC_SILENT = False
@@ -78,9 +75,9 @@
 
     templates_dir = 'populate'
     for idx, context in enumerate(contexts):
-        target = os.path.join(WORKSPACE, out_file.format(idx))
+        target = os.path.join(u.WORKSPACE, out_file.format(idx))
         logging.info('Rendering file: {}'.format(target))
-        osci_utils.render(source, target, context, templates_dir)
+        u.render(source, target, context, templates_dir)
     return target
 
 
@@ -116,9 +113,9 @@
     else:
         logging.basicConfig(level=logging.INFO)
 
-    logging.info('Workspace dir: {}'.format(WORKSPACE))
+    logging.info('Workspace dir: {}'.format(u.WORKSPACE))
 
-    conf_map = osci_utils.read_yaml(osci_utils.MAP_FILE)
+    conf_map = u.read_yaml(u.MAP_FILE)
 
     # gather info and results for comment
     logging.info('Gathering env var items')
@@ -146,7 +143,7 @@
         try_files = []
         logging.debug('Checking for {} try files'.format(trigger_test))
         for try_mask in tt_attrs['try-mask']:
-            these_try_files = glob(os.path.join(WORKSPACE, try_mask))
+            these_try_files = glob(os.path.join(u.WORKSPACE, try_mask))
             try_files.extend(these_try_files)
         if len(try_files) > 0:
             something_ran = True
@@ -162,7 +159,7 @@
         passed = True
         for fail_mask in tt_attrs['fail-mask']:
             logging.debug('Checking fail mask: {}'.format(fail_mask))
-            fyis = glob(os.path.join(WORKSPACE, fail_mask))
+            fyis = glob(os.path.join(u.WORKSPACE, fail_mask))
             if len(fyis) > 0:
                 passed = False
                 logging.debug('Found {} fyi file(s)'.format(trigger_test))
@@ -187,13 +184,13 @@
         this_result = []
         logging.debug('Checking result mask for {}'.format(trigger_test))
         for res_mask in tt_attrs['result-mask']:
-            these_res_files = glob(os.path.join(WORKSPACE, res_mask))
+            these_res_files = glob(os.path.join(u.WORKSPACE, res_mask))
             res_files.extend(these_res_files)
         if len(res_files) > 0:
             logging.info('Found {} results file(s)'.format(trigger_test))
             # handle results files
             for res_file in res_files:
-                pbs[res_file] = osci_utils.pb_it(res_file)
+                pbs[res_file] = u.pb_it(res_file)
                 logging.debug('pastebin for {}: {}'.format(res_file,
                                                            pbs[res_file]))
                 llimit = conf_map['mp-conf']['line-limit']
@@ -236,8 +233,15 @@
                                               params=params)
 
     # read mp comment file and display to console
-    subject = '[UOSCI] {} test result for {}'.format('/'.join(trigger_tests),
-                                                     DISPLAY_NAME)
+    if passed:
+        subject_result = "PASS"
+    else:
+        subject_result = "FAIL"
+
+    subject = '[UOSCI] {}: {} test, {}'.format(subject_result,
+                                               '/'.join(trigger_tests),
+                                               DISPLAY_NAME)
+
     logging.debug('Subject: {}'.format(subject))
     f = open(comment_filename, 'r')
     comment = f.read()
@@ -268,16 +272,16 @@
     if not opts.dry and not opts.no_post and not MPC_SILENT:
         # post mp comment
         logging.debug('Connecting to LP via API')
-        launchpad = osci_utils.lpl_connect(anonymous=False)
+        launchpad = u.lpl_connect(anonymous=False)
         logging.debug('Looking up MP object from LP API')
         try:
-            mp = osci_utils.lpl_get_mp(launchpad, mp_url, lp_branch_url)
+            mp = u.lpl_get_mp(launchpad, mp_url, lp_branch_url)
         except (AttributeError, TypeError):
             logging.error('Merge proposal not found for '
                           '{} on {}'.format(mp_url, lp_branch_url))
             sys.exit(1)
         logging.info('Posting comment to {}'.format(mp_url))
-        osci_utils.lpl_mp_post_comment(launchpad, mp, subject, comment)
+        u.lpl_mp_post_comment(launchpad, mp, subject, comment)
     else:
         logging.info('Not posting comment due to options')
 

=== modified file 'tools/nova_instances_summarize.py'
--- tools/nova_instances_summarize.py	2015-07-10 21:11:38 +0000
+++ tools/nova_instances_summarize.py	2015-08-28 16:23:16 +0000
@@ -3,33 +3,16 @@
 local default juju environment name, and writes a summary yaml text file.
 '''
 
+import logging
 import os
 import sys
-import yaml
-import logging
-import tempfile
 from novaclient import client as nv_client
 sys.path.insert(1, os.path.join(sys.path[0], '..'))
-from common import osci_utils
+from common import osci_utils as u
 
 # Set default logging level
 logging.basicConfig(level=logging.INFO)
 
-try:
-    WORKSPACE = os.environ['WORKSPACE']
-except KeyError:
-    WORKSPACE = tempfile.mkdtemp()
-
-try:
-    JENV_NAME = os.environ['JENV_NAME']
-except KeyError:
-    JENV_NAME = None
-
-try:
-    BUILD_NUMBER = os.environ['BUILD_NUMBER']
-except KeyError:
-    BUILD_NUMBER = '000'
-
 
 def summarize_nova_instances(creds, name_substr=''):
     '''Gather info about nova instances, optionally filtered by
@@ -66,7 +49,7 @@
                 'img-id': str(server.image['id']),
                 'img-name': img_name,
                 'img-date': img_date,
-                'net': osci_utils.dict_unicode_to_str(server.addresses)
+                'net': u.dict_unicode_to_str(server.addresses)
             }
 
     logging.info('Instance count (all): {}'.format(len(servers)))
@@ -77,13 +60,13 @@
 def write_instance_summary_file(inst_summs):
     '''Write out instance summary data to yaml txt file
     '''
-    out_file = 'nova-instance-summary.{}'.format(BUILD_NUMBER)
-    target = os.path.join(WORKSPACE, out_file)
+    out_file = 'nova-instance-summary.{}'.format(u.BUILD_NUMBER)
+    target = os.path.join(u.WORKSPACE, out_file)
     logging.info(' + Creating nova instance summary file: {}'.format(target))
-    osci_utils.write_yaml(inst_summs, target)
+    u.write_yaml(inst_summs, target)
 
     # Quick confirmation of file success
-    test_file = osci_utils.read_yaml(target)
+    test_file = u.read_yaml(target)
     if len(inst_summs) != len(test_file):
         msg = ' ! Instance summary file data may not be complete.'
         return msg
@@ -93,14 +76,18 @@
     '''Gather nova info about current nova instances, create summary file.
     '''
 
-    print 'Starting nova_instances_summarize.'
-    logging.info('Workspace dir: {}'.format(WORKSPACE))
-    creds = osci_utils.get_os_creds()
+    logging.info('UOSCI Nova Instance Summarizer')
+    logging.info('WORKSPACE dir: {}'.format(u.WORKSPACE))
+
+    creds = u.get_os_creds()
+    if not creds:
+        logging.error('Did you source novarc?')
+        sys.exit(1)
 
     # get summary of matching nova instances
-    inst_summs = summarize_nova_instances(creds, name_substr=JENV_NAME)
-    logging.debug('instance summary data: \n{}'.format(
-        yaml.dump(inst_summs, default_flow_style=False)))
+    inst_summs = summarize_nova_instances(creds, name_substr=u.JENV_NAME)
+    logging.debug('Instance summary data: \n{}'.format(
+        u.dict_to_yaml(inst_summs)))
 
     # write summary to file in workspace
     ret = write_instance_summary_file(inst_summs)

=== renamed file 'scan_branches.py' => 'tools/scan_branch_revs.py'
--- scan_branches.py	2015-01-29 19:44:45 +0000
+++ tools/scan_branch_revs.py	2015-08-28 16:23:16 +0000
@@ -1,33 +1,44 @@
 #!/usr/bin/env python
-'''Scans branches which are flagged as trigger branches in the
-mappings.yaml data, watching for branch changes by keeping a
-last state file.
-
-Creates properties files in context of the deployer bundles
-in openstack-charm-testing, for the current Ubuntu Dev release
-and the current Ubuntu LTS release, with the OpenStack release
-that shipped with them, respectively.
-'''
-
-import optparse
+'''
+UOSCI Launchpad Branch Scanner
+'''
+
 import logging
-import yaml
 import os
-import tempfile
-from bzrlib import branch
-from bzrlib.plugin import load_plugins
+import sys
 from copy import deepcopy
-import bzrlib.errors
-from common import osci_utils
-from time import sleep
+
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
+from common import osci_utils as u
 
 USAGE = '''Usage: %prog [options]
 
-Default behavior:
-  Scans branches for changes.  Creates deployment, amulet, and
-  lint properties files.  Saves branch revid state to file.
-
-For example:
+UOSCI Launchpad Branch Scanner
+
+Scans trigger-branches from the mappings.yaml data, watching for
+changes to the launchpad branches, while keeping a simple state file.
+
+Creates deploy, unit, lint, amulet properties files for consumption
+by Jenkins parameterized builds.
+
+Assumes ubuntu-openstack-packagesource and other conventions used by
+bundles in lp:openstack-charm-testing.
+
+Amulet tests and bundle deploy tests will be automatically suppressed
+for any non-charm branches in the trigger list.
+
+Optionally handles per-branch overrides via hash tags appended to
+branch strings in the mappings.yaml control file.
+
+    ie.   - lp:ubuntu-openstack-ci#NOUNIT
+    ie.   - lp:charms/trusty/ubuntu#NODEPLOY#NOUNIT
+
+    #NODEPLOY   Branch changes will not trigger deploy tests.
+    #NOAMULET   Branch changes will not trigger amulet tests.
+    #NOUNIT     Branch changes will not trigger unit tests.
+    #NOLINT     Branch changes will not trigger lint tests.
+
+Example usage:
 
     %prog
   Assumes True for amulet, lint, deploy and all other
@@ -38,358 +49,125 @@
   Performs all default actions (with debug output), leaving the
   state file as it was found.
 
-    %prog -F --XD --XA
+    %prog -FN --XD --XA
   Forces creation of trigger properties files, only for lint,
-  without scanning any of the branches.
+  without scanning any of the branches, and without altering
+  the state file.
 
     %prog --XD
   Scans branches and creates trigger properties files for
-  all checks EXCEPT for the deployments.
+  all checks EXCEPT deployments.
 '''
 
-try:
-    WORKSPACE = os.environ['WORKSPACE']
-except KeyError:
-    WORKSPACE = tempfile.mkdtemp()
-
-
-def branches_changed(conf_map, params, max_tries=10):
-    '''Scan `trigger` branches in the provided dictionary,
-    write current revision number and rev ID to state yaml file.
-    compare with previous scan, create flat text file containing
-    one LP branch per line, representing all added or changed
-    branches (eg. different rev ID or revno).
-    '''
-
-    osci_utils.safe_mkdir(conf_map['misc-conf']['state-dir'])
-    (opts, args) = params
-    load_plugins()
-
-    state_fn = os.path.join(conf_map['misc-conf']['state-dir'],
-                            conf_map['misc-conf']['state-file'])
-
-    if not opts.force:
-        # Read previous branch state from file
-        if os.path.isfile(state_fn):
-            state_prev = osci_utils.read_yaml(state_fn)
-        else:
-            state_prev = {}
-    else:
-        # Don't read due to Force or Dry Run option
-        state_prev = {}
-
-    # Get current branch state
-    if not opts.no_scan:
-        state_now = {}
-        for branch_str in conf_map['trigger-branches']:
-            if not opts.force:
-                logging.info('checking {}'.format(branch_str))