David Caro has uploaded a new change for review.
Change subject: Fixed triggers for ovirt-node
......................................................................
Fixed triggers for ovirt-node
Change-Id: I65ca4b79624b4448a82304ad80f292911c235637
Signed-off-by: David Caro <dcaro...@redhat.com>
---
M jobs/confs/yaml/jobs/ovirt-node/ovirt-node-job.yaml
M jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
A jobs/confs/yaml/triggers/ovirt-node.yaml
3 files changed, 16 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/20/37220/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 6dd6402..a9ae2fb 100644
--- a/jobs/confs/yaml/jobs/ovirt-node/ovirt-node-job.yaml
+++ b/jobs/confs/yaml/jobs/ovirt-node/ovirt-node-job.yaml
@@ -3,12 +3,14 @@
##############################################################################
- project:
name: 'ovirt-node'
+ project: 'ovirt-node'
trigger:
- merged
distro :
- fc20
- el7
version :
- - master
+ - master:
+ branch: master
jobs:
- 'ovirt-node_{version}_create-iso-{distro}_{trigger}'
diff --git a/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
b/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
index b37dcdd..593c68c 100644
--- a/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
+++ b/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
@@ -11,8 +11,7 @@
- ovirt-node
- ovirt-node-iso
triggers:
- - on-patch-{trigger}:
- project: '{project}'
+ - ovirt-node-{trigger}:
branch: '{branch}'
publishers:
- ovirt-node-cleanup:
diff --git a/jobs/confs/yaml/triggers/ovirt-node.yaml
b/jobs/confs/yaml/triggers/ovirt-node.yaml
new file mode 100644
index 0000000..e22f2d6
--- /dev/null
+++ b/jobs/confs/yaml/triggers/ovirt-node.yaml
@@ -0,0 +1,12 @@
+- trigger:
+ name: ovirt-node-merged
+ triggers:
+ - gerrit:
+ trigger-on-change-merged-event: true
+ escape-quotes: true
+ projects:
+ - project-compare-type: 'REG_EXP'
+ project-pattern: 'ovirt-node(-iso)?'
+ branches:
+ - branch-compare-type: 'PLAIN'
+ branch-pattern: '{branch}'
--
To view, visit http://gerrit.ovirt.org/37220
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65ca4b79624b4448a82304ad80f292911c235637
Gerrit-PatchSet: 1
Gerrit-Project: jenkins
Gerrit-Branch: master
Gerrit-Owner: David Caro <dcaro...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
