Merge ~albaguirre/jenkaas-jobs:add-git-support into jenkaas-jobs:master

[Alberto Aguirre]

Add git support

Add support for git based launchpad projects.
It depends on an updated jenkins-launchpad-plugin that also understands git
based merge proposals and projects.

Breakdown of changes:

Credentials
- Parametrize credentials-0-ssh for bazaar only or git only access
- Rename credentials-1-bazaar to credentials-1-vcs
- Parametrize credentials-1-vcs so that it sets up bazaar or git for ssh
  access and additional config that makes 'git clone lp:project' work

Build
- Parametrize build-0-fetch so that it can also create source packages for git
  based projects
- Add additional "source_repo" parameter for git based projects as git merge
  proposals specify both a source repository + a source branch due to the
  nature of git.

Launchpad
- Specify repo type in lp-trigger.sh
- Add "landing_candidate_branch" parameter for git based projects
  so that we can propagate both the source repo + source branch to the build
  job

Other
- Build name customization depending on repo_type so that git based projects use
  <source_repo>:<source_branch>

Limitations
 - All projects defined need to be either bazaar or git - mixing and matching
   of project types is not currently possible.

Depends on:

https://code.launchpad.net/~albaguirre/jenkins-launchpad-plugin/support-query-git-mps/+merge/302329
https://code.launchpad.net/~albaguirre/jenkins-launchpad-plugin/support-voting-on-git-mps/+merge/302451
https://code.launchpad.net/~albaguirre/jenkins-launchpad-plugin/support-lp-trigger-for-git-mps/+merge/302868

7421e65... by Alberto Aguirre on 2016-08-15

Remove extra curly bracket in ci-build parameter.

[Michał Sawicz (saviq)]

From a quick glance my problem with this is that it won't allow you mixing bzr and git projects within a single instance, that would mean you'd have to migrate all projects at once :/

Couldn't we instead set up for both VCS and parametrize on the project level (or even better, decide based on source/target branches and MP data)?

review: Needs Information

Unmerged commits

7421e65... by Alberto Aguirre on 2016-08-15

Remove extra curly bracket in ci-build parameter.

1559cd9... by Alberto Aguirre on 2016-08-13

Add git support

Add support for git based launchpad projects.
It depends on an updated jenkins-launchpad-plugin that also understands git
based merge proposals and projects.

Breakdown of changes:

Credentials
- Parametrize credentials-0-ssh for bazaar only or git only access
- Rename credentials-1-bazaar to credentials-1-vcs
- Parametrize credentials-1-vcs so that it sets up bazaar or git for ssh
  access and additional config that makes 'git clone lp:project' work

Build
- Parametrize build-0-fetch so that it can also create source packages for git
  based projects
- Add additional "source_repo" parameter for git based projects as git merge
  proposals specify both a source repository + a source branch due to the
  nature of git.

Launchpad
- Specify repo type in lp-trigger.sh
- Add "landing_candidate_branch" parameter for git based projects
  so that we can propagate both the source repo + source branch to the build
  job

Other
- Build name customization depending on repo_type so that git based projects use
  <source_repo>:<source_branch>

Limitations
 - All projects defined need to be either bazaar or git - mixing and matching
   of project types is not currently possible.

9acb946... by Alberto Aguirre on 2016-08-13

Don't ignore new files introduced in jenkaas_jobs/yaml/build/

diff --git a/.gitignore b/.gitignore
index 0b904cd..2cd6059 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,6 @@ var/
 
 # Temporary files
 .*.swp
+
+# But don't ignore new files here
+!jenkaas_jobs/yaml/build/
diff --git a/jenkaas_jobs/yaml/build/build-0-fetch-bazaar.sh b/jenkaas_jobs/yaml/build/build-0-fetch-bazaar.sh
new file mode 100644
index 0000000..006ef92
--- /dev/null
+++ b/jenkaas_jobs/yaml/build/build-0-fetch-bazaar.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# log all commands and abort on error
+set -xe
+
+# sanitize input
+bzr revno ${source_branch} || (echo "ERROR: source branch incorrect"; exit 1)
+[ -z "${source_revision}" ] || bzr revno -r ${source_revision} ${source_branch} || (echo "ERROR: source revision incorrect"; exit 2)
+[ -z "${target_branch}" ] || bzr revno ${target_branch} || (echo "ERROR: target branch incorrect"; exit 3)
+
+WORKDIR=${PWD}/source
+OUTDIR=${PWD}/output
+
+# get source branch revision if not provided
+[ -z "${source_revision}" ] && source_revision=`bzr revno ${source_branch}`
+
+echo "INFO: @r${source_revision}"
+
+if [ -n "${target_branch}" ]; then
+  # branch target and merge source
+  bzr branch ${target_branch} ${WORKDIR}
+  bzr merge -d ${WORKDIR} -r ${source_revision} ${source_branch}
+else
+  # or branch source alone
+  bzr branch -r ${source_revision} ${source_branch} ${WORKDIR}
+fi
+
+cd ${WORKDIR}
+
+# determine upstream version
+UPSTREAM_VERSION=`dpkg-parsechangelog | perl -n -e '/^Version:\s(.*?)(-[0-9+](.*)?)?$/ && print $1'`
+
+# build version number
+VERSION="${UPSTREAM_VERSION}+fetch${BUILD_NUMBER}bzr${source_revision}"
+
+NONNATIVE=`dpkg-parsechangelog | perl -n -e '/^Version:\s(.*?)(-.*)?$/ && print $2'`
+if [ -n "${NONNATIVE}" ]; then
+    VERSION="${VERSION}-0ubuntu1"
+fi
+
+# add version to changelog
+dch -v ${VERSION} "Automatic build of ${source_branch} at revision ${source_revision}"
+
+# add base information
+[ -n "${target_branch}" ] && dch "Based on ${target_branch}"
+
+# build source package
+bzr builddeb --builder="debuild -uc -us" --source --result-dir=${OUTDIR}
diff --git a/jenkaas_jobs/yaml/build/build-0-fetch-git.sh b/jenkaas_jobs/yaml/build/build-0-fetch-git.sh
new file mode 100644
index 0000000..8e9bebc
--- /dev/null
+++ b/jenkaas_jobs/yaml/build/build-0-fetch-git.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# log all commands and abort on error
+set -xe
+
+WORKDIR=${PWD}/source
+OUTDIR=${PWD}/output
+
+if [ -n "${target_branch}" ]; then
+  # branch target and merge source
+  git clone ${target_branch} ${WORKDIR}
+  cd ${WORKDIR}
+
+  git remote add source ${source_repo}
+  git fetch source ${source_branch}
+
+  if [ -z "${source_revision}" ]; then
+      git merge source/${source_branch} -m "Merge ${source_branch}"
+  else
+      git merge ${source_revision} -m "Merge ${source_revision}"
+  fi
+else
+  # or branch source alone
+  git clone ${source_repo} ${WORKDIR}
+  cd ${WORKDIR}
+  # no revision provided, just checkout the latest branch
+  if [ -z "${source_revision}" ]; then
+      git checkout -b ${source_branch}
+  else
+      git checkout ${source_revision}
+  fi
+fi
+
+# get source branch revision if not provided
+[ -z "${source_revision}" ] && source_revision=`git log --pretty=%H -n 1`
+
+echo "INFO: @commit:${source_revision}"
+
+# determine upstream version
+UPSTREAM_VERSION=`dpkg-parsechangelog | perl -n -e '/^Version:\s(.*?)(-[0-9+](.*)?)?$/ && print $1'`
+
+# build version number
+VERSION="${UPSTREAM_VERSION}+fetch${BUILD_NUMBER}bzr${source_revision}"
+
+NONNATIVE=`dpkg-parsechangelog | perl -n -e '/^Version:\s(.*?)(-.*)?$/ && print $2'`
+if [ -n "${NONNATIVE}" ]; then
+    VERSION="${VERSION}-0ubuntu1"
+fi
+
+# add version to changelog
+dch -v ${VERSION} "Automatic build of ${source_branch} at revision ${source_revision}"
+
+# add base information
+[ -n "${target_branch}" ] && dch "Based on ${target_branch}"
+
+# build source package
+yes | gbp buildpackage --git-ignore-new --git-builder="debuild -uc -us -S" --git-export-dir=${OUTDIR}
diff --git a/jenkaas_jobs/yaml/build/build-0-fetch.sh b/jenkaas_jobs/yaml/build/build-0-fetch.sh
deleted file mode 100644
index 006ef92..0000000
--- a/jenkaas_jobs/yaml/build/build-0-fetch.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# log all commands and abort on error
-set -xe
-
-# sanitize input
-bzr revno ${source_branch} || (echo "ERROR: source branch incorrect"; exit 1)
-[ -z "${source_revision}" ] || bzr revno -r ${source_revision} ${source_branch} || (echo "ERROR: source revision incorrect"; exit 2)
-[ -z "${target_branch}" ] || bzr revno ${target_branch} || (echo "ERROR: target branch incorrect"; exit 3)
-
-WORKDIR=${PWD}/source
-OUTDIR=${PWD}/output
-
-# get source branch revision if not provided
-[ -z "${source_revision}" ] && source_revision=`bzr revno ${source_branch}`
-
-echo "INFO: @r${source_revision}"
-
-if [ -n "${target_branch}" ]; then
-  # branch target and merge source
-  bzr branch ${target_branch} ${WORKDIR}
-  bzr merge -d ${WORKDIR} -r ${source_revision} ${source_branch}
-else
-  # or branch source alone
-  bzr branch -r ${source_revision} ${source_branch} ${WORKDIR}
-fi
-
-cd ${WORKDIR}
-
-# determine upstream version
-UPSTREAM_VERSION=`dpkg-parsechangelog | perl -n -e '/^Version:\s(.*?)(-[0-9+](.*)?)?$/ && print $1'`
-
-# build version number
-VERSION="${UPSTREAM_VERSION}+fetch${BUILD_NUMBER}bzr${source_revision}"
-
-NONNATIVE=`dpkg-parsechangelog | perl -n -e '/^Version:\s(.*?)(-.*)?$/ && print $2'`
-if [ -n "${NONNATIVE}" ]; then
-    VERSION="${VERSION}-0ubuntu1"
-fi
-
-# add version to changelog
-dch -v ${VERSION} "Automatic build of ${source_branch} at revision ${source_revision}"
-
-# add base information
-[ -n "${target_branch}" ] && dch "Based on ${target_branch}"
-
-# build source package
-bzr builddeb --builder="debuild -uc -us" --source --result-dir=${OUTDIR}
diff --git a/jenkaas_jobs/yaml/build/build-0-fetch.yaml b/jenkaas_jobs/yaml/build/build-0-fetch.yaml
index 7e1649f..d74ddc9 100644
--- a/jenkaas_jobs/yaml/build/build-0-fetch.yaml
+++ b/jenkaas_jobs/yaml/build/build-0-fetch.yaml
@@ -1,11 +1,11 @@
 - job-template:
-    name: build-0-fetch
+    name: 'build-0-fetch-{repo_type}'
     project-type: freestyle
     description: 'This job fetches the source and builds a base source package.'
     concurrent: true
     node: build
     parameters:
-    - branch_parameters
+    - '{repo_type}_build_parameters'
     properties:
     - build-discarder:
         days-to-keep: 60
@@ -14,11 +14,9 @@
     wrappers:
     - workspace-cleanup
     - timestamps
-    - build-name:
-        name: ${{ENV,var="source_branch"}}
+    - '{repo_type}_build_name_wrapper'
     builders:
-    - shell:
-        !include-raw-escape: build-0-fetch.sh
+    - '{repo_type}_builder'
     publishers:
     - description_setter:
         set_for_matrix: 'false'    
diff --git a/jenkaas_jobs/yaml/build/build-1-sourcepkg.yaml b/jenkaas_jobs/yaml/build/build-1-sourcepkg.yaml
index d49a1d8..f25a31e 100644
--- a/jenkaas_jobs/yaml/build/build-1-sourcepkg.yaml
+++ b/jenkaas_jobs/yaml/build/build-1-sourcepkg.yaml
@@ -7,7 +7,7 @@
     parameters:
     - run:
         name: fetch_run
-        project-name: build-0-fetch
+        project-name: build-0-fetch-{repo_type}
         description: The run which to take the base source package from
     properties:
     - build-discarder:
diff --git a/jenkaas_jobs/yaml/build/build.yaml b/jenkaas_jobs/yaml/build/build.yaml
index 0742cec..0adc7a9 100644
--- a/jenkaas_jobs/yaml/build/build.yaml
+++ b/jenkaas_jobs/yaml/build/build.yaml
@@ -2,7 +2,7 @@
     name: build-jobs
     jobs:
     - build
-    - build-0-fetch
+    - build-0-fetch-{repo_type}
     - build-1-sourcepkg
     - build-2-binpkg
 
@@ -21,23 +21,22 @@
     concurrent: true
     node: monitor
     parameters:
-    - branch_parameters
+    - '{repo_type}_build_parameters'
     properties:
     - build-discarder:
         days-to-keep: 60
     - rebuild
     wrappers:
     - timestamps
-    - build-name:
-        name: ${{ENV,var="source_branch"}}
+    - '{repo_type}_build_name_wrapper'
     builders:
     - trigger-builds:
-      - project: build-0-fetch
+      - project: build-0-fetch-{repo_type}
         current-parameters: true
         <<: *trigger_defaults
     - trigger-builds:
       - project: build-1-sourcepkg
-        predefined-parameters: fetch_run=build-0-fetch#${{TRIGGERED_BUILD_NUMBERS_build_0_fetch}}
+        predefined-parameters: fetch_run=build-0-fetch-{repo_type}#${{TRIGGERED_BUILD_NUMBERS_build_0_fetch_{repo_type}}}
         <<: *trigger_defaults
     - trigger-builds:
       - project: build-2-binpkg
diff --git a/jenkaas_jobs/yaml/build/lp-generic-update-mp.sh b/jenkaas_jobs/yaml/build/lp-generic-update-mp.sh
index 1e23eda..e4ebef7 100644
--- a/jenkaas_jobs/yaml/build/lp-generic-update-mp.sh
+++ b/jenkaas_jobs/yaml/build/lp-generic-update-mp.sh
@@ -3,4 +3,4 @@
 # log all commands and abort on error
 set -ex
 
-voteOnMergeProposal --status="${ci_result}" --build-url="${ci_build}" --branch="${ci_branch}" --merge-proposal="${ci_merge_proposal}" --revision="${ci_revision}"
\ No newline at end of file
+voteOnMergeProposal --status="${ci_result}" --build-url="${ci_build}" --merge-proposal="${ci_merge_proposal}" --revision="${ci_revision}"
diff --git a/jenkaas_jobs/yaml/build/lp-generic-update-mp.yaml b/jenkaas_jobs/yaml/build/lp-generic-update-mp.yaml
index 6d5ba0e..30c6f32 100644
--- a/jenkaas_jobs/yaml/build/lp-generic-update-mp.yaml
+++ b/jenkaas_jobs/yaml/build/lp-generic-update-mp.yaml
@@ -1,13 +1,5 @@
-- job-template:
-    name: lp-generic-update-mp
-    project-type: freestyle
-    description: 'Update merge proposal on Launchpad.'
-    node: launchpad
-    properties:
-    - build-discarder:
-        num-to-keep: 100
-    - rebuild:
-        rebuild-disabled: true
+- parameter:
+    name: bazaar_mp_update_parameters
     parameters:
     - string:
         name: ci_result
@@ -20,14 +12,60 @@
         description: Launchpad branch that was processed
     - string:
         name: ci_merge_proposal
-        description: Launchpad merge proposal that was processed        
+        description: Launchpad merge proposal that was processed
+    - string:
+        name: ci_revision
+        description: Revision of the processed branch
+
+- parameter:
+    name: git_mp_update_parameters
+    parameters:
+    - string:
+        name: ci_result
+        description: Result of the CI build
+    - string:
+        name: ci_build
+        description: Jenkins URL of the build
+    - string:
+        name: ci_repo
+        description: Launchpad git repo that was processed
+    - string:
+        name: ci_branch
+        description: Launchpad git branch from ci_repo that was processed
+    - string:
+        name: ci_merge_proposal
+        description: Launchpad merge proposal that was processed
     - string:
         name: ci_revision
-        description: Revision of the processed branch        
+        description: Revision of the processed branch
+
+- wrapper:
+    name: git_mp_update_build_name_wrapper
     wrappers:
-    - timestamps
     - build-name:
-        name: ${{ENV,var="ci_branch"}}
+        name: ${ENV,var="ci_repo"}:${ENV,var="ci_branch"}
+
+- wrapper:
+    name: bazaar_mp_update_build_name_wrapper
+    wrappers:
+    - build-name:
+        name: ${ENV,var="ci_branch"}
+
+- job-template:
+    name: lp-generic-update-mp
+    project-type: freestyle
+    description: 'Update merge proposal on Launchpad.'
+    node: launchpad
+    properties:
+    - build-discarder:
+        num-to-keep: 100
+    - rebuild:
+        rebuild-disabled: true
+    parameters:
+    - '{repo_type}_mp_update_parameters'
+    wrappers:
+    - timestamps
+    - '{repo_type}_mp_update_build_name_wrapper'
     builders:
     - shell:
-        !include-raw-escape: lp-generic-update-mp.sh
\ No newline at end of file
+        !include-raw-escape: lp-generic-update-mp.sh
diff --git a/jenkaas_jobs/yaml/build/macros.yaml b/jenkaas_jobs/yaml/build/macros.yaml
index d352acd..c715167 100644
--- a/jenkaas_jobs/yaml/build/macros.yaml
+++ b/jenkaas_jobs/yaml/build/macros.yaml
@@ -1,5 +1,5 @@
 - parameter:
-    name: branch_parameters
+    name: bazaar_build_parameters
     parameters:
     - string:
         name: source_branch
@@ -9,4 +9,44 @@
         description: Optional revision to fetch, defaults to pull the last one
     - string:
         name: target_branch
-        description: Optional target branch to merge the source on top of
\ No newline at end of file
+        description: Optional target branch to merge the source on top of
+
+- parameter:
+    name: git_build_parameters
+    parameters:
+    - string:
+        name: source_repo
+        description: Git repository to fetch
+    - string:
+        name: source_branch
+        description: Which git branch to fetch from source repo
+    - string:
+        name: source_revision
+        description: Optional revision to fetch, defaults to pull the last one
+    - string:
+        name: target_branch
+        description: Optional target branch to merge the source on top of
+
+- builder:
+    name: git_builder
+    builders:
+      - shell:
+            !include-raw: build-0-fetch-git.sh
+
+- builder:
+    name: bazaar_builder
+    builders:
+      - shell:
+            !include-raw: build-0-fetch-bazaar.sh
+
+- wrapper:
+    name: git_build_name_wrapper
+    wrappers:
+    - build-name:
+        name: ${ENV,var="source_repo"}:${ENV,var="source_branch"}
+
+- wrapper:
+    name: bazaar_build_name_wrapper
+    wrappers:
+    - build-name:
+        name: ${ENV,var="source_branch"}
diff --git a/jenkaas_jobs/yaml/credentials/credentials-0-ssh.sh b/jenkaas_jobs/yaml/credentials/credentials-0-ssh.sh
index 9dd20a5..3d06e00 100644
--- a/jenkaas_jobs/yaml/credentials/credentials-0-ssh.sh
+++ b/jenkaas_jobs/yaml/credentials/credentials-0-ssh.sh
@@ -6,8 +6,8 @@ set -xe
 # put it in $JENKINS_HOME so it doesn't get purged with the workspace
 SSH_PATH="${{JENKINS_HOME}}/.ssh/"
 
-# this is so that this key's only used with bazaar
-SSH_KEY_PATH="${{SSH_PATH}}/bazaar.launchpad.net/{bot_username}"
+# this is so that this key's only used with bazaar or git
+SSH_KEY_PATH="${{SSH_PATH}}/{repo_type}.launchpad.net/{bot_username}"
 
 if [ ! -d "${{SSH_KEY_PATH}}" ]; then
     mkdir -p "${{SSH_KEY_PATH}}"
@@ -19,7 +19,7 @@ cat > "${{SSH_PATH}}/config" << EOF
 Host *
     StrictHostKeyChecking no
 
-Host bazaar.launchpad.net
+Host {repo_type}.launchpad.net
     IdentityFile ~/.ssh/%h/%r/id_rsa
 EOF
 
@@ -40,4 +40,4 @@ fi
 echo "The public key for this jenkins user is:"
 echo "----------"
 cat "${{SSH_KEY_PATH}}/id_rsa.pub"
-echo "----------"
\ No newline at end of file
+echo "----------"
diff --git a/jenkaas_jobs/yaml/credentials/credentials-1-bazaar.yaml b/jenkaas_jobs/yaml/credentials/credentials-1-bazaar.yaml
deleted file mode 100644
index c1b9c73..0000000
--- a/jenkaas_jobs/yaml/credentials/credentials-1-bazaar.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-- job-template:
-    name: credentials-1-bazaar
-    project-type: matrix
-    description: This job configures Bazaar for Launchpad and branch access.
-    node: monitor
-    properties:
-    - build-discarder:
-        num-to-keep: 1
-    - rebuild
-    parameters:
-    - matrix-combinations:
-        name: nodes
-    axes:
-    - axis:
-        type: slave
-        name: node
-        values: '{obj:build_slaves}'
-    wrappers:
-    - timestamps
-    builders:
-      - shell:
-          !include-raw: credentials-1-bazaar.sh
diff --git a/jenkaas_jobs/yaml/credentials/credentials-1-git.sh b/jenkaas_jobs/yaml/credentials/credentials-1-git.sh
new file mode 100644
index 0000000..235272d
--- /dev/null
+++ b/jenkaas_jobs/yaml/credentials/credentials-1-git.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# log all commands and abort on error
+set -xe
+
+git config --global url.git+ssh://{bot_username}@git.launchpad.net/.insteadof lp:
+git config --global user.email "{bot_email}"
+git config --global user.name "{bot_username}"
diff --git a/jenkaas_jobs/yaml/credentials/credentials-1-vcs.yaml b/jenkaas_jobs/yaml/credentials/credentials-1-vcs.yaml
new file mode 100644
index 0000000..c9349d6
--- /dev/null
+++ b/jenkaas_jobs/yaml/credentials/credentials-1-vcs.yaml
@@ -0,0 +1,37 @@
+- builder:
+    name: git_credentials
+    dummy: "test"
+    builders:
+    - shell:
+        !include-raw: credentials-1-git.sh
+
+- builder:
+    name: bazaar_credentials
+    dummy: "test"
+    builders:
+    - shell:
+        !include-raw: credentials-1-bazaar.sh
+
+- job-template:
+    name: credentials-1-{repo_type}
+    project-type: matrix
+    description: This job configures {repo_type} for Launchpad and branch access.
+    node: monitor
+    properties:
+    - build-discarder:
+        num-to-keep: 1
+    - rebuild
+    parameters:
+    - matrix-combinations:
+        name: nodes
+    axes:
+    - axis:
+        type: slave
+        name: node
+        values: '{obj:build_slaves}'
+    wrappers:
+    - timestamps
+    builders:
+      - '{repo_type}_credentials':
+            bot_username: '{bot_username}'
+            bot_email: '{bot_email}'
diff --git a/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.sh b/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.sh
index 5a5cd23..cad6333 100644
--- a/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.sh
+++ b/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.sh
@@ -81,6 +81,10 @@ lp_app: launchpad-trigger
 #you don't need to change this
 lp_env: production
 
+#which launchpad api version to use
+#devel version includes additional querying support for git repos
+lp_version: {lp_version}
+
 #URL of your public jenkins in case you are publishing your jobs to some
 #other jenkins
 public_jenkins_url:
@@ -100,4 +104,4 @@ urls_to_hide: []
 # verbosity of the commands
 # one of: debug, info, warning, error, critical
 log_level: debug
-EOF
\ No newline at end of file
+EOF
diff --git a/jenkaas_jobs/yaml/credentials/credentials.yaml b/jenkaas_jobs/yaml/credentials/credentials.yaml
index d22bd25..292c2b3 100644
--- a/jenkaas_jobs/yaml/credentials/credentials.yaml
+++ b/jenkaas_jobs/yaml/credentials/credentials.yaml
@@ -2,6 +2,6 @@
     name: credentials-jobs
     jobs:
       - credentials-0-ssh
-      - credentials-1-bazaar
+      - credentials-1-{repo_type}
       - credentials-2-launchpad
       - credentials-3-launchpad-plugin
diff --git a/jenkaas_jobs/yaml/defaults.yaml b/jenkaas_jobs/yaml/defaults.yaml
index 805878b..8150f9f 100644
--- a/jenkaas_jobs/yaml/defaults.yaml
+++ b/jenkaas_jobs/yaml/defaults.yaml
@@ -1,5 +1,13 @@
 - defaults:
     name: global
+
+    # Type of repositry the project uses
+    repo_type: bazaar
+
+    # Launchpad API version the jenkins-launchpad-plugin will use. Set
+    # to 'devel' if using a git repository; leave empty to use the default API version
+    lp_version:
+
     # Path to launchpad credentials file
     credentials_path: /var/lib/jenkins/.launchpad.credentials
 
diff --git a/jenkaas_jobs/yaml/launchpad/lp-ci.yaml b/jenkaas_jobs/yaml/launchpad/lp-ci.yaml
index 3119c3b..585e856 100644
--- a/jenkaas_jobs/yaml/launchpad/lp-ci.yaml
+++ b/jenkaas_jobs/yaml/launchpad/lp-ci.yaml
@@ -10,6 +10,25 @@
         days-to-keep: 60
     - rebuild
     parameters:
+    - '{repo_type}_ci_parameters'
+    builders:
+    - '{repo_type}_trigger_build':
+        branch: '{branch}'
+    - matrix-trigger:
+        job: test-0-autopkgtest
+        parameters: |
+          build_run=build#${{TRIGGERED_BUILD_NUMBER_build}}
+          testnames={autopkgtest_names}
+        filter: '{autopkgtest_filter}'
+    wrappers:
+    - timestamps
+    - '{repo_type}_ci_build_name_wrapper'
+    publishers:
+    - '{repo_type}_publisher'
+
+- parameter:
+    name: bazaar_ci_parameters
+    parameters:
     - string:
         name: landing_candidate
         description: Launchpad branch to process
@@ -19,6 +38,25 @@
     - string:
         name: merge_proposal
         description: Optional merge proposal to process
+
+- parameter:
+    name: git_ci_parameters
+    parameters:
+    - string:
+        name: landing_candidate
+        description: Launchpad git repo to process
+    - string:
+        name: landing_candidate_branch
+        description: Git branch from landing_candidate to process
+    - string:
+        name: candidate_revision
+        description: Optional branch revision to process
+    - string:
+        name: merge_proposal
+        description: Optional merge proposal to process
+
+- builder:
+    name: bazaar_trigger_build
     builders:
     - trigger-builds:
         - project:
@@ -28,33 +66,76 @@
             source_branch=${{landing_candidate}}
             source_revision=${{candidate_revision}}
             target_branch={branch}
-    - matrix-trigger:
-        job: test-0-autopkgtest
-        parameters: |
-          build_run=build#${{TRIGGERED_BUILD_NUMBER_build}}
-          testnames={autopkgtest_names}
-        filter: '{autopkgtest_filter}'
+
+- builder:
+    name: git_trigger_build
+    builders:
+    - trigger-builds:
+        - project:
+          - build
+          block: true
+          predefined-parameters: |
+            source_repo=${{landing_candidate}}
+            source_branch=${{landing_candidate_branch}}
+            source_revision=${{candidate_revision}}
+            target_branch={branch}
+
+- wrapper:
+    name: git_ci_build_name_wrapper
+    wrappers:
+    - build-name:
+        name: ${ENV,var="landing_candidate"}:${ENV,var="landing_candidate_branch"}
+
+- wrapper:
+    name: bazaar_ci_build_name_wrapper
     wrappers:
-    - timestamps
     - build-name:
-        name: ${{ENV,var="landing_candidate"}}
+        name: ${ENV,var="landing_candidate"}
+
+- publisher:
+    name: bazaar_publisher
+    publishers:
+    - trigger-parameterized-builds:
+      - project:
+        - lp-generic-update-mp
+        predefined-parameters: |
+          ci_result=PASSED
+          ci_build=${BUILD_URL}
+          ci_branch=${landing_candidate}
+          ci_merge_proposal=${merge_proposal}
+          ci_revision=${candidate_revision}
+        condition: SUCCESS
+      - project:
+        - lp-generic-update-mp
+        predefined-parameters: |
+          ci_result=FAILED
+          ci_build=${BUILD_URL}
+          ci_branch=${landing_candidate}
+          ci_merge_proposal=${merge_proposal}
+          ci_revision=${candidate_revision}
+        condition: UNSTABLE_OR_WORSE
+
+- publisher:
+    name: git_publisher
     publishers:
     - trigger-parameterized-builds:
       - project:
         - lp-generic-update-mp
         predefined-parameters: |
           ci_result=PASSED
-          ci_build=${{BUILD_URL}}
-          ci_branch=${{landing_candidate}}
-          ci_merge_proposal=${{merge_proposal}}
-          ci_revision=${{candidate_revision}}
+          ci_build=${BUILD_URL}
+          ci_repo=${landing_candidate}
+          ci_branch=${landing_candidate_branch}
+          ci_merge_proposal=${merge_proposal}
+          ci_revision=${candidate_revision}
         condition: SUCCESS
       - project:
         - lp-generic-update-mp
         predefined-parameters: |
           ci_result=FAILED
-          ci_build=${{BUILD_URL}}
-          ci_branch=${{landing_candidate}}
-          ci_merge_proposal=${{merge_proposal}}
-          ci_revision=${{candidate_revision}}
+          ci_build=${BUILD_URL}
+          ci_repo=${landing_candidate}
+          ci_branch=${landing_candidate_branch}
+          ci_merge_proposal=${merge_proposal}
+          ci_revision=${candidate_revision}
         condition: UNSTABLE_OR_WORSE
diff --git a/jenkaas_jobs/yaml/launchpad/lp-generic-land-mp.yaml b/jenkaas_jobs/yaml/launchpad/lp-generic-land-mp.yaml
index 3aa557e..3b608d5 100644
--- a/jenkaas_jobs/yaml/launchpad/lp-generic-land-mp.yaml
+++ b/jenkaas_jobs/yaml/launchpad/lp-generic-land-mp.yaml
@@ -15,10 +15,10 @@
         description: Launchpad branch that was processed
     - string:
         name: ci_merge_proposal
-        description: Launchpad merge proposal that was processed        
+        description: Launchpad merge proposal that was processed
     - string:
         name: ci_revision
-        description: Revision of the processed branch        
+        description: Revision of the processed branch
     properties:
     - build-discarder:
         num-to-keep: 100
diff --git a/jenkaas_jobs/yaml/launchpad/lp-trigger-autolanding.sh b/jenkaas_jobs/yaml/launchpad/lp-trigger-autolanding.sh
index 488a91b..359d9e2 100644
--- a/jenkaas_jobs/yaml/launchpad/lp-trigger-autolanding.sh
+++ b/jenkaas_jobs/yaml/launchpad/lp-trigger-autolanding.sh
@@ -3,4 +3,4 @@
 # log all commands and abort on error
 set -ex
 
-launchpadTrigger --lock-name=${{JOB_NAME}} --job=lp-{project}-autoland --branch={branch} --autoland || true
+launchpadTrigger --lock-name=${{JOB_NAME}} --job=lp-{project}-autoland --branch={branch} --repo-type={repo_type} --autoland || true
diff --git a/jenkaas_jobs/yaml/launchpad/lp-trigger.sh b/jenkaas_jobs/yaml/launchpad/lp-trigger.sh
index 15c7a10..de9dcd5 100644
--- a/jenkaas_jobs/yaml/launchpad/lp-trigger.sh
+++ b/jenkaas_jobs/yaml/launchpad/lp-trigger.sh
@@ -4,4 +4,4 @@
 set -ex
 
 # ignore errors from launchpadTrigger as it might just be "unauthorized"
-launchpadTrigger --lock-name=${{JOB_NAME}} --job=lp-{project}-ci --branch={branch} --trigger-ci || true
\ No newline at end of file
+launchpadTrigger --lock-name=${{JOB_NAME}} --job=lp-{project}-ci --branch={branch} --repo-type={repo_type} --trigger-ci || true
diff --git a/jenkaas_jobs/yaml/prepare/prepare-0-install.sh b/jenkaas_jobs/yaml/prepare/prepare-0-install.sh
index 24a2294..397f5bc 100644
--- a/jenkaas_jobs/yaml/prepare/prepare-0-install.sh
+++ b/jenkaas_jobs/yaml/prepare/prepare-0-install.sh
@@ -21,6 +21,7 @@ sudo apt update
 
 # autopkgtest to run autopkgtests
 # bzr-builddeb for building source packages
+# git-buildpackage for building source packages from git repos
 # ccache to prepare the shared ccache dir
 # debhelper for debian/rules clean
 # debootstrap to create the chroots
@@ -33,6 +34,7 @@ sudo apt update
 sudo apt-get install --yes \
   autopkgtest/trusty-backports \
   bzr-builddeb \
+  git-buildpackage \
   ccache \
   debhelper \
   debootstrap \
diff --git a/project-example.yaml b/project-example.yaml
index dbd7205..62001ce 100644
--- a/project-example.yaml
+++ b/project-example.yaml
@@ -16,6 +16,13 @@
     ########## Global variables ##########
     # The variables below apply globally to the whole jenkins setup.
 
+    # The type of repository used - git or bzr. Defaults to bazaar (see defaults.yaml)
+    #repo_type: git
+
+    # Launchpad API version the jenkins-launchpad-plugin will use. Set
+    # to 'devel' if using a git repository, or use the default (see defaults.yaml)
+    #lp_version:
+
     # Your internal jenkins address.
     backend_url: http://your-project-jenkins-be.internal:8080/
 
@@ -167,4 +174,4 @@
         <<: *even_another_project
         autopkgtest_names: test-name.sh autopilot.sh integration.sh
     jobs:
-    - lp-{project}-autolanding
\ No newline at end of file
+    - lp-{project}-autolanding