David Caro has uploaded a new change for review. Change subject: Special trigger for node ......................................................................
Special trigger for node It has to be triggered by two projects at the same time Change-Id: I7fd44e21b13c927b7fb6a27bef480eac4923d1fa Signed-off-by: David Caro <[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 A jobs/confs/yaml/triggers/ovirt-node.yaml 4 files changed, 69 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/28/36128/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 5b97d21..f499b72 100644 --- a/jobs/confs/yaml/jobs/ovirt-node/ovirt-node-job.yaml +++ b/jobs/confs/yaml/jobs/ovirt-node/ovirt-node-job.yaml @@ -2,12 +2,15 @@ ### Projects ############################################################################## - project: - name: 'ovirt-node' + name: ovirt-node + project: + - ovirt-node trigger: - merged distro : - fc20 version : - - master + - master: + branch: master jobs: - 'ovirt-node_{version}_create-iso-{distro}_{trigger}' diff --git a/jobs/confs/yaml/scms/ovirt-node-scms.yaml b/jobs/confs/yaml/scms/ovirt-node-scms.yaml index c95980c..ace7cab 100644 --- a/jobs/confs/yaml/scms/ovirt-node-scms.yaml +++ b/jobs/confs/yaml/scms/ovirt-node-scms.yaml @@ -2,22 +2,31 @@ ### SCM Definitions ############################################################################## - scm: - name: ovirt-node + name: ovirt-node-gerrit scm: - - git: - url: http://gerrit.ovirt.org/p/ovirt-node.git - branches: - - origin/master - scm-name: node - wipe-workspace: true - basedir : "ovirt-node" -- scm: - name: ovirt-node-iso - scm: - - git: - url: http://gerrit.ovirt.org/p/ovirt-node-iso.git - branches: - - origin/master - scm-name: node-iso - wipe-workspace: true - basedir : "ovirt-node-iso" \ No newline at end of file + - git: + url: git://gerrit.ovirt.org/ovirt-node.git + branches: + - $GERRIT_BRANCH + basedir: ovirt-node + scm-name: ovirt-node + name: '' + refspec: $GERRIT_REFSPEC + choosing-strategy: gerrit + use-author: true + skip-tag: true + prune: true + wipe-workspace: false + - git: + url: git://gerrit.ovirt.org/ovirt-node-iso.git + branches: + - $GERRIT_BRANCH + basedir: ovirt-node-iso + scm-name: ovirt-node-iso + name: '' + refspec: $GERRIT_REFSPEC + choosing-strategy: gerrit + use-author: true + skip-tag: true + prune: true + wipe-workspace: false diff --git a/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml b/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml index 90312a1..911a536 100644 --- a/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml +++ b/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml @@ -8,10 +8,9 @@ - ovirt-node_create-iso: distro: '{distro}' scm : - - ovirt-node - - ovirt-node-iso + - '{project}-gerrit' triggers: - - on-patch-{trigger}: + - '{project}-{trigger}': project: '{project}' branch: '{branch}' publishers: diff --git a/jobs/confs/yaml/triggers/ovirt-node.yaml b/jobs/confs/yaml/triggers/ovirt-node.yaml new file mode 100644 index 0000000..2290c58 --- /dev/null +++ b/jobs/confs/yaml/triggers/ovirt-node.yaml @@ -0,0 +1,35 @@ +- trigger: + name: ovirt-node-creater + triggers: + - gerrit: + trigger-on-patchset-uploaded-event: true + escape-quotes: true + projects: + - project-compare-type: 'PLAIN' + project-pattern: '{project}' + branches: + - branch-compare-type: 'PLAIN' + branch-pattern: '{branch}' + - project-compare-type: 'PLAIN' + project-pattern: '{project}-iso' + branches: + - branch-compare-type: 'PLAIN' + branch-pattern: '{branch}' + +- trigger: + name: ovirt-node-merged + triggers: + - gerrit: + trigger-on-change-merged-event: true + escape-quotes: true + projects: + - project-compare-type: 'PLAIN' + project-pattern: '{project}' + branches: + - branch-compare-type: 'PLAIN' + branch-pattern: '{branch}' + - project-compare-type: 'PLAIN' + project-pattern: '{project}-iso' + branches: + - branch-compare-type: 'PLAIN' + branch-pattern: '{branch}' -- To view, visit http://gerrit.ovirt.org/36128 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7fd44e21b13c927b7fb6a27bef480eac4923d1fa Gerrit-PatchSet: 1 Gerrit-Project: jenkins Gerrit-Branch: master Gerrit-Owner: David Caro <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
