lp:~powersj/jenkins-launchpad-plugin/autoland-git

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:jenkins-launchpad-plugin at revision 137

Nicholas Skaggs (community): Approve on 2018-04-20

Joshua Powers (community): Approve on 2018-04-19

Francis Ginther: Needs Information on 2018-03-07

Diff: 176 lines (+106/-3)

3 files modified

HACKING (+1/-1)
jlp/commands/autoland.py (+97/-2)
jlp/launchpadutils.py (+8/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

140. By Joshua Powers on 2018-04-03

From review: make checking for git project a function

139. By Joshua Powers on 2018-03-08

Fixes from review:

* Will correctly set the author string based on the source repo, not
the target repo.
* Allow for not squashing the commits
* Various white space fixes

138. By Joshua Powers on 2018-03-07

Set status for git merges as not auto-completed like bzr is

137. By Joshua Powers on 2018-03-07

Add the ability to autoland git merge proposals.

This adds a dependency on python-git.

This will checkout the source branch, verify that the approved version
is the same as the latest from the source branch. Then checkout the
target branch, add the source as a remote, squash merge, set the
commit message based on the merge proposal's commit message or
description, set the author, and push.

136. By Francis Ginther on 2018-01-29

Add Pipeline reporting

This will go through the stages of a pipeline and report the outcomes of
each stage. It will stop if a failure is found because Jenkins
incorrectly will report all stages after a failure as a success.
[a=powersj][r=fginther]

MP: https://code.launchpad.net/~powersj/jenkins-launchpad-plugin/add-pipeline-report/+merge/326246

135. By Francis Ginther on 2018-01-29

Return the bazaar source, not target branch

Grabbing the target branch is not the correct behavior here. The correct
behavior is to return the source branch of the MP. The target branch is
what the source is attempting to merge into. Tests should be run on the
source and not target.
[a=powersj][r=fginther]

MP: https://code.launchpad.net/~powersj/jenkins-launchpad-plugin/fix-git-source-branch/+merge/326244

134. By Francis Ginther on 2017-12-17

Enable support for Jenkins pipeline type jobs
[a=powersj][r=fginther]

Pipeline jobs do not have downstream projects and currently, this
code causes a KeyError. By capturing this, it allows pipeline jobs to
get executed by the plugin.

133. By Francis Ginther on 2017-12-17

Forcing the revisions to be strings.
[a=powersj][r=fginther]

With the changes adding in git support there are situations where the
returning value of latest_review can be unicode and not int. Therefore,
the comparison of a unicode and int object will fail. This force both
to use string comparison which works for git hashes and bzr int.

132. By Francis Ginther on 2017-02-24

Support triggering and voting on git merge proposals. [a=albaguirre,powersj] [r=fginther]

131. By Francis Ginther on 2017-02-21

Add support to query merge proposals from launchpad git repos. Originally contributied by albaguirre and powersj. [r=albaguirre,powersj]