David Caro has uploaded a new change for review.
Change subject: Fixing vdsm builds
......................................................................
Fixing vdsm builds
There were two issues:
* Gluster repos not being set on el6-ovirt3.5
* Avoiding runnin fc19 mock jobs on fc21 hosts (yum conflicts BZ:1156497)
Change-Id: I782848a7d848cd3e74b7755c144a0170cf26efe6
Signed-off-by: David Caro <dcaro...@redhat.com>
---
M jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml
M jobs/confs/yaml/templates/create-rpms_mock.yaml
2 files changed, 25 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/02/34502/1
diff --git a/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml
b/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml
index c91551c..3a9f652 100644
--- a/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml
+++ b/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml
@@ -5,18 +5,33 @@
trigger:
- merged
version:
- - 3.5:
- branch: ovirt-3.5
+ - 3.5
+ branch: ovirt-3.5
+ mock-build-type: all
+ distro:
+ - fc19:
+ extra-repos: |
+
ovirt-3.5-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro
+
ovirt-3.5-snapshot-static,http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/$distro
+ ci-tools,http://resources.ovirt.org/repos/ci-tools/$distro
+ node_filter: '!fc21'
+ - fc20:
+ extra-repos: |
+
ovirt-3.5-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro
+
ovirt-3.5-snapshot-static,http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/$distro
+ ci-tools,http://resources.ovirt.org/repos/ci-tools/$distro
+ - el6:
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
ci-tools,http://resources.ovirt.org/repos/ci-tools/$distro
- mock-build-type: all
- distro:
- - fc19
- - fc20
- - el6
- - el7
+
gluster-epel6,http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-6/\\$basearch
+ - el7:
+ 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
+ ci-tools,http://resources.ovirt.org/repos/ci-tools/$distro
+
gluster-epel7,http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-7/\\$basearch
arch:
- x86_64
# PPC64 is not available yet
diff --git a/jobs/confs/yaml/templates/create-rpms_mock.yaml
b/jobs/confs/yaml/templates/create-rpms_mock.yaml
index 4797839..24d4830 100644
--- a/jobs/confs/yaml/templates/create-rpms_mock.yaml
+++ b/jobs/confs/yaml/templates/create-rpms_mock.yaml
@@ -1,5 +1,6 @@
- job-template:
name: '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}'
+ node: '{node_filter}'
parameters:
- gerrit-params:
branch: '{branch}'
@@ -29,6 +30,7 @@
## Template for the releng-based jobs
- job-template:
name: '{subproject}_{version}_create-rpms-{distro}-{arch}_{trigger}'
+ node: '{node_filter}'
parameters:
- gerrit-params:
branch: '{branch}'
--
To view, visit http://gerrit.ovirt.org/34502
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I782848a7d848cd3e74b7755c144a0170cf26efe6
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
