David Caro has uploaded a new change for review.
Change subject: Fixing mock fc19 built on fc21 issue
......................................................................
Fixing mock fc19 built on fc21 issue
It does not only affect vdsm, but all the projects.
Change-Id: I6db497aaad9ed9d37cba72c09116fb7d2a3cc1ec
Signed-off-by: David Caro <dcaro...@redhat.com>
---
M jobs/confs/yaml/jobs/ioprocess/ioprocess_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-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/ovirt-reports/ovirt-reports_create-rpms.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_create-rpms.yaml
M jobs/confs/yaml/templates/create-rpms_mock.yaml
14 files changed, 24 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/20/34520/1
diff --git a/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml
b/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml
index 361a4c1..8a6a141 100644
--- a/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml
+++ b/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml
@@ -10,7 +10,8 @@
mock-build-type:
- all
distro:
- - fc19
+ - fc19:
+ node-filter: '!fc21'
- fc20
- fc21
- el6
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 15ec282..bf618cc 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
@@ -20,6 +20,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
+ node-filter: '!fc21'
- fc20
arch:
- x86_64
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 4e76bb3..fa7a7c2 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
@@ -18,6 +18,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
+ node-filter: '!fc21'
- fc20
arch:
- x86_64
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 fe70c0e..a1ddac4 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
@@ -18,6 +18,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
+ node-filter: '!fc21'
- fc20
arch:
- x86_64
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 a478f29..b788fb9 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
@@ -33,7 +33,8 @@
trigger:
- merged
distro:
- - fc19
+ - fc19:
+ node-filter: '!fc21'
- fc20
- el6
- el7
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 70cfc67..97df509 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
@@ -39,7 +39,8 @@
ovirt-3.5-snapshot-static,http://resources.ovirt.org/pub/ovirt-3.5-snapshot-static/rpm/$distro
mock-build-type: onlyrpm
distro:
- - fc19
+ - fc19:
+ node-filter: '!fc21'
- fc20
- el6:
extra-build-packages: |
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 24e754a..da1f2a5 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
@@ -13,7 +13,8 @@
mock-build-type:
- onlyrpm
distro:
- - fc19
+ - fc19:
+ node-filter: '!fc21'
- 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 245dea5..6c15e1f 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
@@ -13,7 +13,8 @@
mock-build-type:
- onlyrpm
distro:
- - fc19
+ - fc19:
+ node-filter: '!fc21'
- 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 389287e..f515118 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
@@ -13,7 +13,8 @@
mock-build-type:
- onlyrpm
distro:
- - fc19
+ - fc19:
+ node-filter: '!fc21'
- fc20
- el6
arch:
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 798d041..4b685e5 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
@@ -18,7 +18,8 @@
mock-build-type:
- onlyrpm
distro:
- - fc19
+ - fc19:
+ node-filter: '!fc21'
- fc20
- el6
arch:
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 3fe0d70..99772fb 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
@@ -13,7 +13,8 @@
mock-build-type:
- all
distro:
- - fc19
+ - fc19:
+ node-filter: '!fc21'
- fc20
- fc21
- el6
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 7aa424d..f2cb864 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
@@ -10,7 +10,8 @@
mock-build-type:
- onlyrpm
distro:
- - fc19
+ - fc19:
+ node-filter: '!fc21'
- fc20
- el6:
extra-repos: |
diff --git a/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml
b/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml
index 3a9f652..39859be 100644
--- a/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml
+++ b/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml
@@ -14,7 +14,7 @@
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'
+ node-filter: '!fc21'
- fc20:
extra-repos: |
ovirt-3.5-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro
diff --git a/jobs/confs/yaml/templates/create-rpms_mock.yaml
b/jobs/confs/yaml/templates/create-rpms_mock.yaml
index 24d4830..e178c9e 100644
--- a/jobs/confs/yaml/templates/create-rpms_mock.yaml
+++ b/jobs/confs/yaml/templates/create-rpms_mock.yaml
@@ -1,6 +1,6 @@
- job-template:
name: '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}'
- node: '{node_filter}'
+ node: '{node-filter}'
parameters:
- gerrit-params:
branch: '{branch}'
@@ -30,7 +30,7 @@
## Template for the releng-based jobs
- job-template:
name: '{subproject}_{version}_create-rpms-{distro}-{arch}_{trigger}'
- node: '{node_filter}'
+ node: '{node-filter}'
parameters:
- gerrit-params:
branch: '{branch}'
--
To view, visit http://gerrit.ovirt.org/34520
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6db497aaad9ed9d37cba72c09116fb7d2a3cc1ec
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
