Merge lp:~nskaggs/ubuntu-terminal-app/add-jenkins-info into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Nicholas Skaggs]

add jenkins info and mp readme

add jenkins info and mp readme

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:183
https://core-apps-jenkins.ubuntu.com/job/terminal-app-ci/46/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/700/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/terminal-app-ci/46/rebuild

review: Approve (continuous-integration)

[Stefano Verzegnassi (verzegnassi-stefano)]

review: Approve

=== added file 'README.mergeproposal.md'
--- README.mergeproposal.md	1970-01-01 00:00:00 +0000
+++ README.mergeproposal.md	2016-03-04 20:09:15 +0000
@@ -0,0 +1,32 @@
+Prerequisites to approving a Merge Proposal (MP)
+================================================
+
+Over time, it has been found that insufficient testing by reviewers sometimes leads to terminal trunk not buildable in Qtcreator due to manifest errors, or translation pot file not updated. As such, please follow the checklist below before top-approving a MP.
+
+Checklist
+=========
+
+*   Does the MP add/remove user visible strings? If Yes, has the pot file been
+    updated?
+
+*   Does the MP change the UI? If Yes, has it been approved by design?
+
+*   Did you perform an exploratory manual test run of your code change and any
+    related functionality?
+
+*   If the MP fixes a bug or implements a feature, are there accompanying unit
+    and autopilot tests?
+
+*   Is the terminal trunk buildable and runnable using Qtcreator?
+
+*   Was the debian changelog updated?
+
+*   Was the copyright years updated if necessary?
+
+The above checklist is more of a guideline to help terminal trunk stay buildable,
+stable and up to date.
+
+
+Jenkins
+=======
+In addition to manual reviews, merge proposals are subject to being run in jenkins to ensure the application builds and any unit tests are successful. For more information on jenkins and how it works, see the [Core Apps Jenkins Wiki](https://wiki.ubuntu.com/Touch/CoreApps/Jenkins)