We're running most of the jobs on all machines, with the major
notable exception being the various *-rpm jobs which of course
only make sense for RPM-based distributions.
Instead of listing machines over and over again, define two
list globally and refer to them by name. Ad-hoc machine lists
are still needed in a few places, but overall this cuts down on
repetition significantly.
Signed-off-by: Andrea Bolognani
---
jobs/defaults.yaml| 14 ++
projects/libosinfo.yaml | 16 ++--
projects/libvirt-cim.yaml | 6 +-
projects/libvirt-glib.yaml| 16 ++--
projects/libvirt-go-xml.yaml | 10 +-
projects/libvirt-go.yaml | 10 +-
projects/libvirt-perl.yaml| 16 ++--
projects/libvirt-python.yaml | 16 ++--
projects/libvirt.yaml | 27 +++
projects/osinfo-db-tools.yaml | 16 ++--
projects/osinfo-db.yaml | 16 ++--
projects/virt-viewer.yaml | 16 ++--
12 files changed, 42 insertions(+), 137 deletions(-)
diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml
index 23f8555..9fe69de 100644
--- a/jobs/defaults.yaml
+++ b/jobs/defaults.yaml
@@ -3,6 +3,20 @@
name: global
branch: master
node: libvirt
+all_machines:
+ - libvirt-centos-7
+ - libvirt-debian-8
+ - libvirt-debian-9
+ - libvirt-fedora-26
+ - libvirt-fedora-27
+ - libvirt-fedora-rawhide
+ - libvirt-freebsd-10
+ - libvirt-freebsd-11
+rpm_machines:
+ - libvirt-centos-7
+ - libvirt-fedora-26
+ - libvirt-fedora-27
+ - libvirt-fedora-rawhide
global_env: |
local_env: |
smp: 3
diff --git a/projects/libosinfo.yaml b/projects/libosinfo.yaml
index ac04027..0d25447 100644
--- a/projects/libosinfo.yaml
+++ b/projects/libosinfo.yaml
@@ -1,15 +1,7 @@
- project:
name: libosinfo
-machines:
- - libvirt-centos-7
- - libvirt-debian-8
- - libvirt-debian-9
- - libvirt-fedora-26
- - libvirt-fedora-27
- - libvirt-fedora-rawhide
- - libvirt-freebsd-10
- - libvirt-freebsd-11
+machines: '{all_machines}'
title: libosinfo
jobs:
- autotools-build-job:
@@ -20,8 +12,4 @@
parent_jobs: 'libosinfo-master-syntax-check'
- autotools-rpm-job:
parent_jobs: 'libosinfo-master-check'
- machines:
-- libvirt-centos-7
-- libvirt-fedora-26
-- libvirt-fedora-27
-- libvirt-fedora-rawhide
+ machines: '{rpm_machines}'
diff --git a/projects/libvirt-cim.yaml b/projects/libvirt-cim.yaml
index 160faaf..dff3976 100644
--- a/projects/libvirt-cim.yaml
+++ b/projects/libvirt-cim.yaml
@@ -1,11 +1,7 @@
- project:
name: libvirt-cim
-machines:
- - libvirt-centos-7
- - libvirt-fedora-26
- - libvirt-fedora-27
- - libvirt-fedora-rawhide
+machines: '{rpm_machines}'
title: libvirt CIM
jobs:
- autotools-build-job:
diff --git a/projects/libvirt-glib.yaml b/projects/libvirt-glib.yaml
index 74f7642..741ac44 100644
--- a/projects/libvirt-glib.yaml
+++ b/projects/libvirt-glib.yaml
@@ -1,15 +1,7 @@
- project:
name: libvirt-glib
-machines:
- - libvirt-centos-7
- - libvirt-debian-8
- - libvirt-debian-9
- - libvirt-fedora-26
- - libvirt-fedora-27
- - libvirt-fedora-rawhide
- - libvirt-freebsd-10
- - libvirt-freebsd-11
+machines: '{all_machines}'
title: Libvirt GLib
jobs:
- autotools-build-job:
@@ -21,8 +13,4 @@
parent_jobs: 'libvirt-glib-master-syntax-check'
- autotools-rpm-job:
parent_jobs: 'libvirt-glib-master-check'
- machines:
-- libvirt-centos-7
-- libvirt-fedora-26
-- libvirt-fedora-27
-- libvirt-fedora-rawhide
+ machines: '{rpm_machines}'
diff --git a/projects/libvirt-go-xml.yaml b/projects/libvirt-go-xml.yaml
index 126058b..1f26751 100644
--- a/projects/libvirt-go-xml.yaml
+++ b/projects/libvirt-go-xml.yaml
@@ -1,15 +1,7 @@
- project:
name: libvirt-go-xml
-machines:
- - libvirt-centos-7
- - libvirt-debian-8
- - libvirt-debian-9
- - libvirt-fedora-26
- - libvirt-fedora-27
- - libvirt-fedora-rawhide
- - libvirt-freebsd-10
- - libvirt-freebsd-11
+machines: '{all_machines}'
title: Libvirt Go XML
local_env: |
export TEST_ARGS="-tags xmlroundtrip"
diff --git a/projects/libvirt-go.yaml b/projects/libvirt-go.yaml
index 141c862..f40f523 100644
--- a/projects/libvirt-go.yaml
+++ b/projects/libvirt-go.yaml
@@ -1,15 +1,7 @@
- project:
name: libvirt-go
-machines:
- - libvirt-centos-7
- - libvirt-debian-8
- - libvirt-debian-9
- - libvirt-fedora-26
- - libvirt-fedora-27
- - libvirt-fedora-rawhide
- - libvirt-freebsd-10
- -