From 8533c1406bacfad46687f8603940b7655a6f31b6 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Mon, 21 May 2012 14:17:41 +0100
Subject: [PATCH] Add merge-check to Ceilometer

Change-Id: If5ba611483a06721ca899c0e3ac8313b4a3f5ea7
---
 .../files/projects/stackforge/ceilometer.yml  | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml b/modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml
index f0785321bd..9991e9b003 100644
--- a/modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml
+++ b/modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml
@@ -36,3 +36,43 @@ scm:
 
 assignednode:
   node: 'oneiric'
+
+---
+modules:
+  - properties
+  - scm
+  - assignednode
+  - trigger_gerrit
+  - builders
+  - publisher_none
+
+main:
+  name: 'check-ceilometer-merge'
+  site: 'stackforge'
+  project: 'ceilometer'
+  authenticatedBuild: 'true'
+  disabled: 'false'
+
+trigger:
+  triggerOnPatchsetUploadedEvent: 'true'
+  triggerOnChangeMergedEvent: 'false'
+  triggerOnCommentAddedEvent: 'false'
+  triggerOnRefUpdatedEvent: 'false'
+  overrideVotes: 'true'
+  gerritBuildSuccessfulVerifiedValue: 1
+  gerritBuildFailedVerifiedValue: -1
+  failureMessage: 'This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.'
+  projects:
+    - projectCompareType: 'PLAIN'
+      projectPattern: 'stackforge/ceilometer'
+      branchCompareType: 'ANT'
+      branchPattern: '**'
+
+builders:
+  - gerrit_git_prep
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'oneiric'