Sandro Bonazzola has uploaded a new change for review. Change subject: jobs: start dropping fc19 support on master ......................................................................
jobs: start dropping fc19 support on master oVirt 3.6 won't support fc19 anymore. Change-Id: Iddc6583be5d6a813b8a355518728523528eab0b6 Related-To: http://lists.ovirt.org/pipermail/devel/2014-August/008519.html Signed-off-by: Sandro Bonazzola <[email protected]> --- M jobs/confs/yaml/jobs/ovirt-hosted-engine-ha/ovirt-hosted-engine-ha_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-hosted-engine-setup/ovirt-hosted-engine-setup_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/vdsm/vdsm_install-rpm-sanity.yaml 6 files changed, 120 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/59/31659/1 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 4a3e91c..0c1b6a5 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 @@ -1,5 +1,33 @@ - project: - name: ovirt-hosted-engine-ha_create-rpms + name: ovirt-hosted-engine-ha_master_create-rpms + project: + - ovirt-hosted-engine-ha + trigger: + - merged + distro: + - fc20 + - el6 + - el7 + version: + - master: + extra-repos: | + 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 + arch: + - x86_64 + jobs: + - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}': + extra-configure-options: | + --prefix=/usr \ + --exec_prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var + +- project: + name: ovirt-hosted-engine-ha_3.5_create-rpms project: - ovirt-hosted-engine-ha trigger: @@ -15,11 +43,6 @@ 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 - - master: - extra-repos: | - 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 arch: diff --git a/jobs/confs/yaml/jobs/ovirt-hosted-engine-setup/ovirt-hosted-engine-setup_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-hosted-engine-setup/ovirt-hosted-engine-setup_create-rpms.yaml index c5efb28..98d8278 100644 --- a/jobs/confs/yaml/jobs/ovirt-hosted-engine-setup/ovirt-hosted-engine-setup_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-hosted-engine-setup/ovirt-hosted-engine-setup_create-rpms.yaml @@ -1,5 +1,32 @@ - project: - name: ovirt-hosted-engine-setup_create-rpms + name: ovirt-hosted-engine-setup_master_create-rpms + project: + - ovirt-hosted-engine-setup + trigger: + - merged + version: + - master: + extra-repos: | + 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 + distro: + - fc20 + - el6: + extra-build-packages: | + otopi-devtools + autoconf + gettext-devel + automake + - el7 + arch: + - x86_64 + jobs: + - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}' + +- project: + name: ovirt-hosted-engine-setup_3.5_create-rpms project: - ovirt-hosted-engine-setup trigger: @@ -10,11 +37,6 @@ 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 - - master: - extra-repos: | - 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 distro: - fc19 @@ -30,7 +52,6 @@ - x86_64 jobs: - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}' - - project: name: ovirt-hosted-engine-setup_3.4_create-rpms 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 ca6c0ad..387c3f2 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 @@ -15,6 +15,27 @@ 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 + distro: + - fc19 + - fc20 + - el6 + arch: + - x86_64 + jobs: + - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}' + +## jjb does not allow discarding variable combination when exploding +## the template, so if we don't want fc19 for branch master, we have to +## create a separated template for it +- project: + name: ovirt-image-uploader_master_create-rpms + project: + - ovirt-image-uploader + trigger: + - merged + version: - master: extra-repos: | ovirt-master-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro @@ -23,7 +44,6 @@ mock-build-type: - onlyrpm distro: - - fc19 - fc20 - el6 arch: 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 f19c8fc..9dcf8f5 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 @@ -15,6 +15,27 @@ 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 + distro: + - fc19 + - fc20 + - el6 + arch: + - x86_64 + jobs: + - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}' + +## jjb does not allow discarding variable combination when exploding +## the template, so if we don't want fc19 for branch master, we have to +## create a separated template for it +- project: + name: ovirt-iso-uploader_master_create-rpms + project: + - ovirt-iso-uploader + trigger: + - merged + version: - master: extra-repos: | ovirt-master-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro @@ -23,7 +44,6 @@ mock-build-type: - onlyrpm distro: - - fc19 - fc20 - el6 arch: 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 777f7d6..b3a2baf 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 @@ -15,6 +15,27 @@ 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 + distro: + - fc19 + - fc20 + - el6 + arch: + - x86_64 + jobs: + - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}' + +## jjb does not allow discarding variable combination when exploding +## the template, so if we don't want fc19 for branch master, we have to +## create a separated template for it +- project: + name: ovirt-log-collector_master_create-rpms + project: + - ovirt-log-collector + trigger: + - merged + version: - master: extra-repos: | ovirt-master-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro @@ -23,7 +44,6 @@ mock-build-type: - onlyrpm distro: - - fc19 - fc20 - el6 arch: 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 cfb1515..248f785 100644 --- a/jobs/confs/yaml/jobs/vdsm/vdsm_install-rpm-sanity.yaml +++ b/jobs/confs/yaml/jobs/vdsm/vdsm_install-rpm-sanity.yaml @@ -13,7 +13,6 @@ mock-build-type: - onlyrpm distro: - - fc19 - fc20 - el6: extra-repos: | -- To view, visit http://gerrit.ovirt.org/31659 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iddc6583be5d6a813b8a355518728523528eab0b6 Gerrit-PatchSet: 1 Gerrit-Project: jenkins Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
