From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 1 Mar 2016 14:14:51 +0000 (-0500)
Subject: configure the ceph-installer merge job to trigger on merges
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F330%2Fhead;p=ceph-build.git

configure the ceph-installer merge job to trigger on merges

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-installer-coverage/config/definitions/ceph-installer-coverage.yml b/ceph-installer-coverage/config/definitions/ceph-installer-coverage.yml
new file mode 100644
index 00000000..dda83e4f
--- /dev/null
+++ b/ceph-installer-coverage/config/definitions/ceph-installer-coverage.yml
@@ -0,0 +1,47 @@
+- job:
+    name: ceph-installer-coverage
+    node: small && (trusty || centos)
+    project-type: freestyle
+    defaults: global
+    display-name: 'ceph-installer: coverage'
+    quiet-period: 5
+    block-downstream: false
+    block-upstream: false
+    retry-count: 3
+    properties:
+      - github:
+          url: https://github.com/ceph/ceph-installer
+    logrotate:
+      daysToKeep: -1
+      numToKeep: 10
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
+
+    triggers:
+      - github
+
+    scm:
+      - git:
+          url: https://github.com/ceph/ceph-installer
+          branches:
+            - master
+          browser: auto
+          skip-tag: true
+          timeout: 20
+
+    builders:
+      - shell:
+          !include-raw:
+            - ../../../scripts/build_utils.sh
+            - ../../build/build
+
+    publishers:
+      - cobertura:
+          results: coverage.xml
+          only-stable: "true"
+          fail-no-reports: "true"
+          targets:
+            - method:
+                healthy: 50
+      - junit:
+          results: junit.xml
diff --git a/ceph-installer-coverage/config/definitions/ceph-installer-merged.yml b/ceph-installer-coverage/config/definitions/ceph-installer-merged.yml
deleted file mode 100644
index 1574b411..00000000
--- a/ceph-installer-coverage/config/definitions/ceph-installer-merged.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-- job:
-    name: ceph-installer-merged
-    node: small && (trusty || centos)
-    project-type: freestyle
-    defaults: global
-    display-name: 'ceph-installer: master merge build'
-    quiet-period: 5
-    block-downstream: false
-    block-upstream: false
-    retry-count: 3
-    properties:
-      - github:
-          url: https://github.com/ceph/ceph-installer
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-
-    triggers:
-      - github
-
-    scm:
-      - git:
-          url: https://github.com/ceph/ceph-installer
-          branches:
-            - master
-          browser: auto
-          skip-tag: true
-          timeout: 20
-
-    builders:
-      - shell:
-          !include-raw:
-            - ../../../scripts/build_utils.sh
-            - ../../build/build
-
-    publishers:
-      - cobertura:
-          results: coverage.xml
-          only-stable: "true"
-          fail-no-reports: "true"
-          targets:
-            - method:
-                healthy: 50
-      - junit:
-          results: junit.xml