Merge lp://qastaging/~1chb1n/ubuntu-openstack-ci/ubuntu-openstack-ci-mp-initial into lp://qastaging/ubuntu-openstack-ci
Proposed by
Ryan Beisner
| Status: | Merged |
|---|---|
| Merged at revision: | 14 |
| Proposed branch: | lp://qastaging/~1chb1n/ubuntu-openstack-ci/ubuntu-openstack-ci-mp-initial |
| Merge into: | lp://qastaging/ubuntu-openstack-ci |
| Diff against target: |
1046 lines (+812/-34) 15 files modified
common/osci_utils.py (+56/-0) deployment/jobs/_reset_branch_scanner_state/config.xml (+78/-0) deployment/jobs/_reset_mp_scanner_state/config.xml (+78/-0) deployment/jobs/trigger_by_mp_scanner/config.xml (+146/-0) job-parts/reset_branch_trigger.sh (+4/-0) job-parts/reset_mp_trigger.sh (+4/-0) job-parts/trigger_by_branch_scanner.sh (+1/-1) job-parts/trigger_by_mp_scanner.sh (+47/-0) populate.py (+11/-20) populate/amulet-properties.tmpl (+4/-0) populate/deploy-properties.tmpl (+3/-0) populate/lint-properties.tmpl (+3/-1) populate/mappings.yaml (+23/-12) populate/unit-properties.tmpl (+4/-0) scan_merge_props.py (+350/-0) |
| To merge this branch: | bzr merge lp://qastaging/~1chb1n/ubuntu-openstack-ci/ubuntu-openstack-ci-mp-initial |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ryan Beisner (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Commit first iteration of the new merge proposal scanner / triggers (sans deployer, just unit, lint, amulet triggers in this merge).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Go!