Save all the macros into one file.

Change-Id: I127f8fe6bc1f108eae1ef84132e61eb69262f47f

5 files changed, 47 insertions, 46 deletions

diff --git a/build-gluster-org/jobs/git.yml b/build-gluster-org/jobs/git.yml
deleted file mode 100644
index 2a38e67..0000000
--- a/build-gluster-org/jobs/git.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- scm:
-    name: glusterfs
-    scm:
-    - git:
-        branches:
-        - $GERRIT_BRANCH
-        refspec: $GERRIT_REFSPEC
-        choosing-strategy: gerrit
-        url: git://review.gluster.org/glusterfs.git
-
diff --git a/build-gluster-org/jobs/macros.yml b/build-gluster-org/jobs/macros.yml
new file mode 100644
index 0000000..6d3aff3
--- /dev/null
+++ b/build-gluster-org/jobs/macros.yml
@@ -0,0 +1,46 @@
+- scm:
+    name: glusterfs
+    scm:
+    - git:
+        branches:
+        - $GERRIT_BRANCH
+        refspec: $GERRIT_REFSPEC
+        choosing-strategy: gerrit
+        url: git://review.gluster.org/glusterfs.git
+
+- property:
+    name: discard-after-x
+    properties:
+    - build-discarder:
+        days-to-keep: '{x}'
+        num-to-keep: '{x}'
+        artifact-days-to-keep: '{x}'
+        artifact-num-to-keep: '{x}'
+
+- property:
+    name: one-build-per-node
+    properties:
+    - throttle:
+        max-per-node: 1
+        enabled: true
+        option: project
+
+- publisher:
+    name: rpm
+    publishers:
+    - archive:
+        allow-empty: false
+        artifacts: RPMS/**
+        default-excludes: true
+        fingerprint: false
+        only-if-success: false
+
+- publisher:
+    name: strfmt-build-log
+    publishers:
+    - archive:
+        allow-empty: false
+        artifacts: RPMS/el6/i686/build.log
+        default-excludes: true
+        fingerprint: false
+        only-if-success: false
diff --git a/build-gluster-org/jobs/properties.yml b/build-gluster-org/jobs/properties.yml
deleted file mode 100644
index 62af861..0000000
--- a/build-gluster-org/jobs/properties.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- property:
-    name: discard-after-x
-    properties:
-    - build-discarder:
-        days-to-keep: '{x}'
-        num-to-keep: '{x}'
-        artifact-days-to-keep: '{x}'
-        artifact-num-to-keep: '{x}'
-
-- property:
-    name: one-build-per-node
-    properties:
-    - throttle:
-        max-per-node: 1
-        enabled: true
-        option: project
diff --git a/build-gluster-org/jobs/publishers.yml b/build-gluster-org/jobs/publishers.yml
deleted file mode 100644
index 8b8ba3e..0000000
--- a/build-gluster-org/jobs/publishers.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-- publisher:
-    name: rpm
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: RPMS/**
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-
-- publisher:
-    name: build-log
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: RPMS/el6/i686/build.log
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
diff --git a/build-gluster-org/jobs/strfmt_errors.yml b/build-gluster-org/jobs/strfmt_errors.yml
index adf565f..bef35b6 100644
--- a/build-gluster-org/jobs/strfmt_errors.yml
+++ b/build-gluster-org/jobs/strfmt_errors.yml
@@ -42,7 +42,7 @@
         name: GERRIT_BRANCH
 
     publishers:
-    - build-log
+    - strfmt-build-log
 
     builders:
     - shell: !include-raw: ../scripts/strfmt_errors.sh