Anatoly Litovsky has uploaded a new change for review.

Change subject: Adding branches support in the ovirt node prm builders
......................................................................

Adding branches support in the ovirt node prm builders

Change-Id: I8e5bbf563b3fac0b1734f5b35db65d739181d7cf
Signed-off-by: Tolik Litovsky <[email protected]>
---
M jobs/confs/yaml/jobs/ovirt-node/ovirt-node-job.yaml
M jobs/confs/yaml/scms/ovirt-node-scms.yaml
M jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
3 files changed, 12 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/32/38332/1

diff --git a/jobs/confs/yaml/jobs/ovirt-node/ovirt-node-job.yaml 
b/jobs/confs/yaml/jobs/ovirt-node/ovirt-node-job.yaml
index 906663f..e9333b4 100644
--- a/jobs/confs/yaml/jobs/ovirt-node/ovirt-node-job.yaml
+++ b/jobs/confs/yaml/jobs/ovirt-node/ovirt-node-job.yaml
@@ -17,7 +17,7 @@
       - 'ovirt-node_{version}_create-iso-{distro}_{trigger}'
 
 - project:
-    name: 'ovirt-node-rpm-builder'
+    name: 'ovirt-node-rpm-builder-master'
     project: 'ovirt-node'
     trigger:
       - merged
@@ -28,5 +28,8 @@
     version :
       - master:
           branch: master
+      - ovirt-3.5:
+          branch: ovirt-3.5
     jobs:
       - 'ovirt-node_{version}_create-rpms-{distro}_{trigger}'
+
diff --git a/jobs/confs/yaml/scms/ovirt-node-scms.yaml 
b/jobs/confs/yaml/scms/ovirt-node-scms.yaml
index cda4040..83b41e9 100644
--- a/jobs/confs/yaml/scms/ovirt-node-scms.yaml
+++ b/jobs/confs/yaml/scms/ovirt-node-scms.yaml
@@ -7,7 +7,7 @@
         - git:
             url: git://gerrit.ovirt.org/ovirt-node.git
             branches:
-              - origin/master
+              - origin/{branch}
             scm-name: node
             wipe-workspace: true
             basedir : "ovirt-node"
@@ -17,7 +17,7 @@
         - git:
             url: git://gerrit.ovirt.org/ovirt-node-iso.git
             branches:
-              - origin/master
+              - origin/{branch}
             scm-name: node-iso
             wipe-workspace: true
             basedir : "ovirt-node-iso"
diff --git a/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml 
b/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
index ec6ed5d..9fc3bb7 100644
--- a/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
+++ b/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
@@ -12,8 +12,10 @@
           clean_pre: 'false'
           publish_rpms: 'true'
     scm :
-          - ovirt-node
-          - ovirt-node-iso
+          - ovirt-node:
+              branch: '{version}'
+          - ovirt-node-iso:
+              branch: '{version}'
     triggers:
       - ovirt-node-{trigger}:
           branch: '{branch}'
@@ -35,7 +37,8 @@
           clean_pre: 'true'
           publish_rpms: 'true'
     scm :
-          - ovirt-node
+      - ovirt-node:
+          branch: '{version}'
     triggers:
       - ovirt-node-{trigger}:
           branch: '{branch}'


-- 
To view, visit https://gerrit.ovirt.org/38332
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e5bbf563b3fac0b1734f5b35db65d739181d7cf
Gerrit-PatchSet: 1
Gerrit-Project: jenkins
Gerrit-Branch: master
Gerrit-Owner: Anatoly Litovsky <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to