David Caro has uploaded a new change for review. Change subject: Adapting to latest jjb (1.1.0/1.1.1) ......................................................................
Adapting to latest jjb (1.1.0/1.1.1) Change-Id: I8e5b6c346653ad0e65b819e70225020db31711ca Signed-off-by: David Caro <[email protected]> --- M jobs/confs/yaml/jobs/ebay-cors-filter/ebay-cors-filter.yaml M jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml M jobs/confs/yaml/jobs/jenkins/jenkins_check_yaml.yaml M jobs/confs/yaml/jobs/jenkins/jenkins_deploy_yamls.yaml M jobs/confs/yaml/jobs/kexec-tools/kexec-tools_create-rpms.yaml M jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-ldap/ovirt-engine-extension-aaa-ldap_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-misc/ovirt-engine-extension-aaa-misc_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-engine-extension-logger-log4j/ovirt-engine-extension-logger-log4j_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-engine-sdk-java/ovirt-engine-sdk-java_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-engine-wildfly/ovirt-engine-wildfly.yaml M jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-hosted-engine-ha/ovirt-hosted-engine-ha_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-image-uploader/ovirt-image-uploader_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-iso-uploader/ovirt-iso-uploader_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-log-collector/ovirt-log-collector_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-reports/ovirt-reports_create-rpms.yaml M jobs/confs/yaml/jobs/python-windows/python-windows.yaml M jobs/confs/yaml/jobs/qemu/qemu_create-rpms.yaml M jobs/confs/yaml/jobs/slf4j/slf4j.yaml M jobs/confs/yaml/jobs/unboundid-ldapsdk/unboundid-ldapsdk_create-rpms.yaml M jobs/confs/yaml/jobs/vdsm-jsonrpc-java/vdsm-jsonrpc-java_create-rpms.yaml M jobs/confs/yaml/jobs/vdsm/vdsm_install-rpm-sanity.yaml M jobs/confs/yaml/scms/jenkins.yaml M jobs/confs/yaml/triggers/gerrit.yaml 25 files changed, 128 insertions(+), 149 deletions(-) git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/85/39185/1 diff --git a/jobs/confs/yaml/jobs/ebay-cors-filter/ebay-cors-filter.yaml b/jobs/confs/yaml/jobs/ebay-cors-filter/ebay-cors-filter.yaml index 130a5d3..178d3e3 100644 --- a/jobs/confs/yaml/jobs/ebay-cors-filter/ebay-cors-filter.yaml +++ b/jobs/confs/yaml/jobs/ebay-cors-filter/ebay-cors-filter.yaml @@ -1,7 +1,6 @@ - project: name: ebay-cors-filter_create-rpms - project: - - releng-tools + project: releng-tools subproject: - ebay-cors-filter trigger: @@ -10,8 +9,7 @@ version: - master: branch: master - mock-build-type: - - all + mock-build-type: all distro: - fc20 - fc21 diff --git a/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml b/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml index 9df713c..02b544b 100644 --- a/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml @@ -8,8 +8,7 @@ version: - master: branch: master - mock-build-type: - - all + mock-build-type: all distro: - fc20 - fc21 diff --git a/jobs/confs/yaml/jobs/jenkins/jenkins_check_yaml.yaml b/jobs/confs/yaml/jobs/jenkins/jenkins_check_yaml.yaml index 05f930b..7c3328a 100644 --- a/jobs/confs/yaml/jobs/jenkins/jenkins_check_yaml.yaml +++ b/jobs/confs/yaml/jobs/jenkins/jenkins_check_yaml.yaml @@ -6,14 +6,16 @@ branch: master triggers: - gerrit: - trigger-on-patchset-uploaded-event: true + trigger-on: + - patchset-created-event escape-quotes: true successful-message: 'You can check the diff in the job summary' projects: - project-compare-type: 'PLAIN' project-pattern: 'jenkins' - branch-compare-type: 'PLAIN' - branch-pattern: 'master' + branches: + - branch-compare-type: 'PLAIN' + branch-pattern: 'master' file-paths: - compare-type: 'REG_EXP' pattern: 'jobs/confs/.*' diff --git a/jobs/confs/yaml/jobs/jenkins/jenkins_deploy_yamls.yaml b/jobs/confs/yaml/jobs/jenkins/jenkins_deploy_yamls.yaml index 276f2a2..4a6ded4 100644 --- a/jobs/confs/yaml/jobs/jenkins/jenkins_deploy_yamls.yaml +++ b/jobs/confs/yaml/jobs/jenkins/jenkins_deploy_yamls.yaml @@ -12,8 +12,9 @@ projects: - project-compare-type: 'PLAIN' project-pattern: 'jenkins' - branch-compare-type: 'PLAIN' - branch-pattern: 'master' + branches: + - branch-compare-type: 'PLAIN' + branch-pattern: 'master' file-paths: - compare-type: 'REG_EXP' pattern: 'jobs/confs/.*' diff --git a/jobs/confs/yaml/jobs/kexec-tools/kexec-tools_create-rpms.yaml b/jobs/confs/yaml/jobs/kexec-tools/kexec-tools_create-rpms.yaml index 1816b99..c6d90fa 100644 --- a/jobs/confs/yaml/jobs/kexec-tools/kexec-tools_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/kexec-tools/kexec-tools_create-rpms.yaml @@ -1,7 +1,6 @@ - project: name: kexec-tools_create-rpms - project: - - releng-tools + project: releng-tools subproject: - kexec-tools trigger: @@ -10,8 +9,7 @@ version: - master: branch: master - mock-build-type: - - all + mock-build-type: all distro: - el6: extra-build-options: el6 diff --git a/jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml b/jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml index 3e28399..f84d7eb 100644 --- a/jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml @@ -8,8 +8,7 @@ version: - master: branch: master - mock-build-type: - - all + mock-build-type: all distro: - fc20 - fc21 diff --git a/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-ldap/ovirt-engine-extension-aaa-ldap_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-ldap/ovirt-engine-extension-aaa-ldap_create-rpms.yaml index a3a4033..b6e4870 100644 --- a/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-ldap/ovirt-engine-extension-aaa-ldap_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-ldap/ovirt-engine-extension-aaa-ldap_create-rpms.yaml @@ -11,8 +11,7 @@ ovirt-master-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro ovirt-master-snapshot-static,http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/$distro branch: master - mock-build-type: - - onlyrpm + mock-build-type: onlyrpm distro: - el6 - el7 diff --git a/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-misc/ovirt-engine-extension-aaa-misc_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-misc/ovirt-engine-extension-aaa-misc_create-rpms.yaml index 1ee91be..79e14b6 100644 --- a/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-misc/ovirt-engine-extension-aaa-misc_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-misc/ovirt-engine-extension-aaa-misc_create-rpms.yaml @@ -11,8 +11,7 @@ ovirt-master-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro ovirt-master-snapshot-static,http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/$distro branch: master - mock-build-type: - - onlyrpm + mock-build-type: onlyrpm distro: - el6 - el7 diff --git a/jobs/confs/yaml/jobs/ovirt-engine-extension-logger-log4j/ovirt-engine-extension-logger-log4j_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-engine-extension-logger-log4j/ovirt-engine-extension-logger-log4j_create-rpms.yaml index b772a48..3a53718 100644 --- a/jobs/confs/yaml/jobs/ovirt-engine-extension-logger-log4j/ovirt-engine-extension-logger-log4j_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-engine-extension-logger-log4j/ovirt-engine-extension-logger-log4j_create-rpms.yaml @@ -11,8 +11,7 @@ ovirt-master-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro ovirt-master-snapshot-static,http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/$distro branch: master - mock-build-type: - - onlyrpm + mock-build-type: onlyrpm distro: - el6 - el7 diff --git a/jobs/confs/yaml/jobs/ovirt-engine-sdk-java/ovirt-engine-sdk-java_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-engine-sdk-java/ovirt-engine-sdk-java_create-rpms.yaml index 4880a7c..a7cca85 100644 --- a/jobs/confs/yaml/jobs/ovirt-engine-sdk-java/ovirt-engine-sdk-java_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-engine-sdk-java/ovirt-engine-sdk-java_create-rpms.yaml @@ -9,8 +9,7 @@ branch: master - 3.5: branch: sdk_3.5 - mock-build-type: - - all + mock-build-type: all distro: - fc21 - fc20 diff --git a/jobs/confs/yaml/jobs/ovirt-engine-wildfly/ovirt-engine-wildfly.yaml b/jobs/confs/yaml/jobs/ovirt-engine-wildfly/ovirt-engine-wildfly.yaml index 8a54941..c6b2952 100644 --- a/jobs/confs/yaml/jobs/ovirt-engine-wildfly/ovirt-engine-wildfly.yaml +++ b/jobs/confs/yaml/jobs/ovirt-engine-wildfly/ovirt-engine-wildfly.yaml @@ -1,7 +1,6 @@ - project: name: ovirt-engine-wildfly_create-rpms - project: - - releng-tools + project: releng-tools subproject: - ovirt-engine-wildfly trigger: @@ -10,8 +9,7 @@ version: - master: branch: master - mock-build-type: - - all + mock-build-type: all distro: - el7 - el6 diff --git a/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml index a04c688..79e0d35 100644 --- a/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml @@ -16,8 +16,7 @@ ovirt-master-snapshot,http://resources.ovirt.org/pub/ovirt-3.5-snapshot/rpm/$distro ovirt-master-snapshot-static,http://resources.ovirt.org/pub/ovirt-3.5-snapshot-static/rpm/$distro branch: ovirt-host-deploy-1.3 - mock-build-type: - - all + mock-build-type: all distro: - el6 - el7 diff --git a/jobs/confs/yaml/jobs/ovirt-hosted-engine-ha/ovirt-hosted-engine-ha_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-hosted-engine-ha/ovirt-hosted-engine-ha_create-rpms.yaml index 10a28da..4cd5586 100644 --- a/jobs/confs/yaml/jobs/ovirt-hosted-engine-ha/ovirt-hosted-engine-ha_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-hosted-engine-ha/ovirt-hosted-engine-ha_create-rpms.yaml @@ -15,8 +15,7 @@ ovirt-master-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro ovirt-master-snapshot-static,http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/$distro branch: master - mock-build-type: - - onlyrpm + mock-build-type: onlyrpm arch: - x86_64 jobs: @@ -44,8 +43,7 @@ extra-repos: | ovirt-3.5-snapshot,http://resources.ovirt.org/pub/ovirt-3.5-snapshot/rpm/$distro ovirt-3.5-snapshot-static,http://resources.ovirt.org/pub/ovirt-3.5-snapshot-static/rpm/$distro - mock-build-type: - - onlyrpm + mock-build-type: onlyrpm arch: - x86_64 jobs: diff --git a/jobs/confs/yaml/jobs/ovirt-image-uploader/ovirt-image-uploader_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-image-uploader/ovirt-image-uploader_create-rpms.yaml index 0a16f6c..077b79e 100644 --- a/jobs/confs/yaml/jobs/ovirt-image-uploader/ovirt-image-uploader_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-image-uploader/ovirt-image-uploader_create-rpms.yaml @@ -14,8 +14,7 @@ extra-repos: | ovirt-3.5-snapshot,http://resources.ovirt.org/pub/ovirt-3.5-snapshot/rpm/$distro ovirt-3.5-snapshot-static,http://resources.ovirt.org/pub/ovirt-3.5-snapshot-static/rpm/$distro - mock-build-type: - - onlyrpm + mock-build-type: onlyrpm distro: - fc20 - el6 @@ -37,8 +36,7 @@ ovirt-master-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro ovirt-master-snapshot-static,http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/$distro branch: master - mock-build-type: - - onlyrpm + mock-build-type: onlyrpm distro: - fc20 - fc21 diff --git a/jobs/confs/yaml/jobs/ovirt-iso-uploader/ovirt-iso-uploader_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-iso-uploader/ovirt-iso-uploader_create-rpms.yaml index faccfbe..981793d 100644 --- a/jobs/confs/yaml/jobs/ovirt-iso-uploader/ovirt-iso-uploader_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-iso-uploader/ovirt-iso-uploader_create-rpms.yaml @@ -11,8 +11,7 @@ extra-repos: | ovirt-3.5-snapshot,http://resources.ovirt.org/pub/ovirt-3.5-snapshot/rpm/$distro ovirt-3.5-snapshot-static,http://resources.ovirt.org/pub/ovirt-3.5-snapshot-static/rpm/$distro - mock-build-type: - - onlyrpm + mock-build-type: onlyrpm distro: - fc20 - el6 @@ -38,8 +37,7 @@ ovirt-master-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro ovirt-master-snapshot-static,http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/$distro branch: master - mock-build-type: - - onlyrpm + mock-build-type: onlyrpm distro: - fc20 - fc21 diff --git a/jobs/confs/yaml/jobs/ovirt-log-collector/ovirt-log-collector_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-log-collector/ovirt-log-collector_create-rpms.yaml index 7aebdb2..d931f26 100644 --- a/jobs/confs/yaml/jobs/ovirt-log-collector/ovirt-log-collector_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-log-collector/ovirt-log-collector_create-rpms.yaml @@ -14,8 +14,7 @@ extra-repos: | ovirt-3.5-snapshot,http://resources.ovirt.org/pub/ovirt-3.5-snapshot/rpm/$distro ovirt-3.5-snapshot-static,http://resources.ovirt.org/pub/ovirt-3.5-snapshot-static/rpm/$distro - mock-build-type: - - onlyrpm + mock-build-type: onlyrpm distro: - fc20 - el6 @@ -38,8 +37,7 @@ ovirt-master-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro ovirt-master-snapshot-static,http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/$distro branch: master - mock-build-type: - - onlyrpm + mock-build-type: onlyrpm distro: - fc21 - fc20 diff --git a/jobs/confs/yaml/jobs/ovirt-reports/ovirt-reports_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-reports/ovirt-reports_create-rpms.yaml index cb762d9..bde62eb 100644 --- a/jobs/confs/yaml/jobs/ovirt-reports/ovirt-reports_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-reports/ovirt-reports_create-rpms.yaml @@ -16,8 +16,7 @@ ovirt-master-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro ovirt-master-snapshot-static,http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/$distro branch: master - mock-build-type: - - all + mock-build-type: all arch: - x86_64 extra-build-packages: | @@ -42,8 +41,7 @@ extra-repos: | ovirt-3.5-snapshot,http://resources.ovirt.org/pub/ovirt-3.5-snapshot/rpm/$distro ovirt-3.5-snapshot-static,http://resources.ovirt.org/pub/ovirt-3.5-snapshot-static/rpm/$distro - mock-build-type: - - all + mock-build-type: all arch: - x86_64 extra-build-packages: | diff --git a/jobs/confs/yaml/jobs/python-windows/python-windows.yaml b/jobs/confs/yaml/jobs/python-windows/python-windows.yaml index 6290261..c276fe3 100644 --- a/jobs/confs/yaml/jobs/python-windows/python-windows.yaml +++ b/jobs/confs/yaml/jobs/python-windows/python-windows.yaml @@ -1,7 +1,6 @@ - project: name: python-windows - project: - - ovirt-wgt-toolchain + project: ovirt-wgt-toolchain subproject: - python-windows trigger: @@ -10,8 +9,7 @@ version: - master: branch: master - mock-build-type: - - all + mock-build-type: all distro: - fc21 arch: diff --git a/jobs/confs/yaml/jobs/qemu/qemu_create-rpms.yaml b/jobs/confs/yaml/jobs/qemu/qemu_create-rpms.yaml index f3c2f4d..33482bb 100644 --- a/jobs/confs/yaml/jobs/qemu/qemu_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/qemu/qemu_create-rpms.yaml @@ -1,7 +1,6 @@ - project: name: qemu_create-rpms - project: - - releng-tools + project: releng-tools subproject: - qemu trigger: @@ -10,8 +9,7 @@ version: - master: branch: master - mock-build-type: - - all + mock-build-type: all distro: - el7: extra-repos: | diff --git a/jobs/confs/yaml/jobs/slf4j/slf4j.yaml b/jobs/confs/yaml/jobs/slf4j/slf4j.yaml index fbce791..56a3ef0 100644 --- a/jobs/confs/yaml/jobs/slf4j/slf4j.yaml +++ b/jobs/confs/yaml/jobs/slf4j/slf4j.yaml @@ -1,7 +1,6 @@ - project: name: slf4j_create-rpms - project: - - releng-tools + project: releng-tools subproject: - slf4j trigger: @@ -10,8 +9,7 @@ version: - master: branch: master - mock-build-type: - - all + mock-build-type: all distro: - el6: extra-repos: ci-tools,http://resources.ovirt.org/repos/ci-tools/el6 diff --git a/jobs/confs/yaml/jobs/unboundid-ldapsdk/unboundid-ldapsdk_create-rpms.yaml b/jobs/confs/yaml/jobs/unboundid-ldapsdk/unboundid-ldapsdk_create-rpms.yaml index b14bb5c..75cb41d 100644 --- a/jobs/confs/yaml/jobs/unboundid-ldapsdk/unboundid-ldapsdk_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/unboundid-ldapsdk/unboundid-ldapsdk_create-rpms.yaml @@ -1,7 +1,6 @@ - project: name: unboundid-ldapsdk_create-rpms - project: - - releng-tools + project: releng-tools subproject: - unboundid-ldapsdk trigger: @@ -10,8 +9,7 @@ version: - master: branch: master - mock-build-type: - - all + mock-build-type: all distro: - fc20 - fc21 diff --git a/jobs/confs/yaml/jobs/vdsm-jsonrpc-java/vdsm-jsonrpc-java_create-rpms.yaml b/jobs/confs/yaml/jobs/vdsm-jsonrpc-java/vdsm-jsonrpc-java_create-rpms.yaml index f9d0c18..c888841 100644 --- a/jobs/confs/yaml/jobs/vdsm-jsonrpc-java/vdsm-jsonrpc-java_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/vdsm-jsonrpc-java/vdsm-jsonrpc-java_create-rpms.yaml @@ -8,8 +8,7 @@ version: - 3.5: branch: ovirt-3.5 - mock-build-type: - - onlyrpm + mock-build-type: onlyrpm distro: - fc20 - el6: @@ -35,8 +34,7 @@ version: - master: branch: master - mock-build-type: - - onlyrpm + mock-build-type: onlyrpm distro: - fc20 - fc21 diff --git a/jobs/confs/yaml/jobs/vdsm/vdsm_install-rpm-sanity.yaml b/jobs/confs/yaml/jobs/vdsm/vdsm_install-rpm-sanity.yaml index 9c7c288..0da8fd8 100644 --- a/jobs/confs/yaml/jobs/vdsm/vdsm_install-rpm-sanity.yaml +++ b/jobs/confs/yaml/jobs/vdsm/vdsm_install-rpm-sanity.yaml @@ -7,8 +7,7 @@ version: - master: branch: master - mock-build-type: - - onlyrpm + mock-build-type: onlyrpm distro: - fc20: extra-repos: | diff --git a/jobs/confs/yaml/scms/jenkins.yaml b/jobs/confs/yaml/scms/jenkins.yaml index 3a7bb62..3be5beb 100644 --- a/jobs/confs/yaml/scms/jenkins.yaml +++ b/jobs/confs/yaml/scms/jenkins.yaml @@ -10,7 +10,9 @@ name: '' refspec: $GERRIT_REFSPEC choosing-strategy: gerrit - clean: true + clean: + before: true + after: false use-author: true wipe-workspace: false skip-tag: true @@ -28,7 +30,9 @@ refspec: '' scm-name: jenkins name: '' - clean: true + clean: + before: true + after: false use-author: true wipe-workspace: false skip-tag: true diff --git a/jobs/confs/yaml/triggers/gerrit.yaml b/jobs/confs/yaml/triggers/gerrit.yaml index 2756a47..ab0e1ab 100644 --- a/jobs/confs/yaml/triggers/gerrit.yaml +++ b/jobs/confs/yaml/triggers/gerrit.yaml @@ -2,103 +2,109 @@ name: on-patch-created 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}' + trigger-on: + - patchset-created-event + escape-quotes: true + projects: + - project-compare-type: 'PLAIN' + project-pattern: '{project}' + branches: + - branch-compare-type: 'PLAIN' + branch-pattern: '{branch}' - trigger: name: on-patch-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}' + trigger-on: + - change-merged-event + escape-quotes: true + projects: + - project-compare-type: 'PLAIN' + project-pattern: '{project}' + branches: + - branch-compare-type: 'PLAIN' + branch-pattern: '{branch}' - trigger: name: on-patch-created-with-files 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}' - file-paths: - - compare-type: REG_EXP - pattern: '{files}' + trigger-on: + - patchset-created-event + escape-quotes: true + projects: + - project-compare-type: 'PLAIN' + project-pattern: '{project}' + branches: + - branch-compare-type: 'PLAIN' + branch-pattern: '{branch}' + file-paths: + - compare-type: REG_EXP + pattern: '{files}' - trigger: name: on-patch-merged-with-files 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}' - file-paths: - - compare-type: REG_EXP - pattern: '{files}' + trigger-on: + - change-merged-event + escape-quotes: true + projects: + - project-compare-type: 'PLAIN' + project-pattern: '{project}' + branches: + - branch-compare-type: 'PLAIN' + branch-pattern: '{branch}' + file-paths: + - compare-type: REG_EXP + pattern: '{files}' - trigger: name: on-patch-created-with-files-whitelist 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}' - file-paths: - - compare-type: REG_EXP - pattern: '{files}' - notbuilt-message: | - To avoid overloading the infrastructure, a whitelist for - running gerrit triggered jobs has been set in place, if - you feel like you should be in it, please contact infra at - ovirt dot org. - skip-vote: - notbuilt: true + trigger-on: + - patchset-created-event + escape-quotes: true + projects: + - project-compare-type: 'PLAIN' + project-pattern: '{project}' + branches: + - branch-compare-type: 'PLAIN' + branch-pattern: '{branch}' + file-paths: + - compare-type: REG_EXP + pattern: '{files}' + notbuilt-message: | + To avoid overloading the infrastructure, a whitelist for + running gerrit triggered jobs has been set in place, if + you feel like you should be in it, please contact infra at + ovirt dot org. + skip-vote: + notbuilt: true - trigger: name: on-patch-merged-with-files-whitelist 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}' - file-paths: - - compare-type: REG_EXP - pattern: '{files}' - notbuilt-message: | - To avoid overloading the infrastructure, a whitelist for - running gerrit triggered jobs has been set in place, if - you feel like you should be in it, please contact infra at - ovirt dot org. - skip-vote: - notbuilt: true + trigger-on: + - change-merged-event + escape-quotes: true + projects: + - project-compare-type: 'PLAIN' + project-pattern: '{project}' + branches: + - branch-compare-type: 'PLAIN' + branch-pattern: '{branch}' + file-paths: + - compare-type: REG_EXP + pattern: '{files}' + notbuilt-message: | + To avoid overloading the infrastructure, a whitelist for + running gerrit triggered jobs has been set in place, if + you feel like you should be in it, please contact infra at + ovirt dot org. + skip-vote: + notbuilt: true -- To view, visit https://gerrit.ovirt.org/39185 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e5b6c346653ad0e65b819e70225020db31711ca 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
