Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/host_vars/libvirt-centos-6/install.yml | 3 - guests/host_vars/libvirt-centos-6/main.yml | 9 --- guests/inventory | 1 - guests/vars/mappings.yml | 16 +---- guests/vars/projects/libvirt.yml | 1 - guests/vars/vault.yml | 86 +++++++++++++-------------- 6 files changed, 42 insertions(+), 74 deletions(-) delete mode 100644 guests/host_vars/libvirt-centos-6/install.yml delete mode 100644 guests/host_vars/libvirt-centos-6/main.yml diff --git a/guests/host_vars/libvirt-centos-6/install.yml b/guests/host_vars/libvirt-centos-6/install.yml deleted file mode 100644 index 3a9459b..0000000 --- a/guests/host_vars/libvirt-centos-6/install.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -install_url: http://mirror.centos.org/centos/6/os/x86_64/ -install_config: kickstart.cfg diff --git a/guests/host_vars/libvirt-centos-6/main.yml b/guests/host_vars/libvirt-centos-6/main.yml deleted file mode 100644 index 422d033..0000000 --- a/guests/host_vars/libvirt-centos-6/main.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -PERL5LIB: $VIRT_PREFIX/lib64/perl5 -PYTHONPATH: $VIRT_PREFIX/lib64/python2.6/site-packages - -projects: - - libvirt - - libvirt-cim - - libvirt-perl - - libvirt-python diff --git a/guests/inventory b/guests/inventory index 41826ee..4e69dcb 100644 --- a/guests/inventory +++ b/guests/inventory @@ -1,4 +1,3 @@ -libvirt-centos-6 libvirt-centos-7 libvirt-debian-8 libvirt-debian-9 diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index cb44b3d..0e29a1b 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -9,7 +9,7 @@ # - default # - package format (deb, pkg, rpm) # - OS name (CentOS, Debian, Fedora, FreeBSD, Ubuntu) -# - OS version (CentOS6, Debian9, FedoraRawhide, Ubuntu14 and so on) +# - OS version (CentOS7, Debian9, FedoraRawhide, Ubuntu14 and so on) # # So something like # @@ -58,7 +58,6 @@ mappings: bash-completion: default: bash-completion - CentOS6: ccache: default: ccache @@ -145,20 +144,17 @@ mappings: go: default: golang FreeBSD: go - CentOS6: Ubuntu14: gobject-introspection: deb: libgirepository1.0-dev pkg: gobject-introspection rpm: gobject-introspection-devel - CentOS6: gtk3: deb: libgtk-3-dev pkg: gtk3 rpm: gtk3-devel - CentOS6: gtk-doc: default: gtk-doc @@ -168,7 +164,6 @@ mappings: deb: libgtk-vnc-2.0-dev pkg: gtk-vnc rpm: gtk-vnc2-devel - CentOS6: hal: FreeBSD: hal @@ -234,9 +229,6 @@ mappings: Debian: libgovirt-dev Debian8: - libnl: - CentOS6: libnl-devel - libnl3: deb: libnl-3-dev rpm: libnl3-devel @@ -282,7 +274,6 @@ mappings: rpm: libssh-devel Debian: libssh-gcrypt-dev Ubuntu: libssh-dev - CentOS6: libssh2: deb: libssh2-1-dev @@ -436,7 +427,6 @@ mappings: deb: libcpan-changes-perl pkg: p5-CPAN-Changes rpm: perl-CPAN-Changes - CentOS6: perl-Config-Record: deb: libconfig-record-perl @@ -447,13 +437,11 @@ mappings: deb: libdigest-perl pkg: p5-Digest rpm: perl-Digest - CentOS6: perl-Digest-MD5: deb: libdigest-perl-md5-perl pkg: p5-Digest-MD5 rpm: perl-Digest-MD5 - CentOS6: Ubuntu14: perl-ExtUtils-MakeMaker: @@ -657,7 +645,6 @@ mappings: deb: libspice-client-gtk-3.0-dev pkg: spice-gtk rpm: spice-gtk3-devel - CentOS6: sudo: default: sudo @@ -673,7 +660,6 @@ mappings: vala: default: vala deb: valac - CentOS6: vim: default: vim diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml index 9f027f8..8cfe077 100644 --- a/guests/vars/projects/libvirt.yml +++ b/guests/vars/projects/libvirt.yml @@ -22,7 +22,6 @@ packages: - libcap-ng - libcurl - libdbus - - libnl - libnl3 - libnlroute3 - libnuma diff --git a/guests/vars/vault.yml b/guests/vars/vault.yml index 5b5504e..15ef76f 100644 --- a/guests/vars/vault.yml +++ b/guests/vars/vault.yml @@ -1,46 +1,42 @@ $ANSIBLE_VAULT;1.1;AES256 -65383961343931383034323931343431663863336439383062306134393231613032306466383066 -6466656433353431303462383737323537323462313864300a653135633963393336386431376434 -37386338643636386334633961636530636437316639346332653466663861316538313639363564 -3663663762396333630a316534323362663861626563366561643237326663653664316565663236 -33343435343662353635623336636133313030393734626362306164306666623235383634616464 -35623632363063303333666338363962653664326234636435363533346231623364386563663334 -32376332623932663838316662306463663365343438366537343065663834373237626135626137 -35313661643535396632313239363035393132373135356233663432326635396464616666393965 -66306261653664323733613266333732663434653839653236656264613634356335626635323833 -37313232623337646563386361393139326636303734376538383636636464333964336466623034 -37663436613939333761333861343137363231623966643634616663613037663662396161373630 -36633961643633366538366435396565353131633339393632363632656462316430653262363439 -61656665623764336364323263326637626537626362336631616365333161366164326262323235 -38633133326366316161326331313932363865656164376564396138623665646533663065303737 -66633631633631383531386533663339323033343765333333306466303065633136346266626230 -37323938366262653064663835376165313436386465326264396134316663373565303263366333 -62393930376165636334623136616633623066643334653737663234383633356234336139386338 -32353564623734376637633237623534333439346165643237646437303735623861633534393166 -33313832396139366162643236366533326138363237663638376462393437343231646263386265 -64613931643733346238363033326631373239316439376364333435653138396463326539306430 -33613839646337326234363639326439376530336561363635346366613431386463396561356130 -37613035306334626663363933316361323233313239653338376130343331383936376236666364 -62633666376261626463303532383730336236396233633363303831376534393831366539373530 -30326530646133386632343564333433623363353463363131646139663561386433353034623461 -38643262363331363030643362333930326263356634333739363634373037366333613365306439 -32636532313339666336366634363631343463393461353139373464356536386538666533306464 -39613334643938356265623366313138343361383339616239323764626234373761373432623965 -62316532336164333136303363383036353863333838656138343736636436393164313862326130 -64666137643631626334653537356436313937653139323033656162343332336566663138393539 -66666530643737363965663839306238656638613039333239623034346232313731626666303166 -66356634373664343931323533306434303235636439313333666262633334653531356633393131 -33346438346136386363356530383834663335613832663664323564393533376264326133636166 -63383634656232376664313631393863313139376465656266383132626664353538633531636263 -31313133316265643931623866363436663234393562623838653730343363623666643234663934 -38373533393936346333346238393261373738663236303335326264646132616338396630613631 -39343232346531663565333533393730323338636232386365366538376163346534333439373965 -61643864393734666435353134313464333431646535363731623430326664666261326262633932 -34643263643736343461303539313864656531353365656661633439343339626362386139333632 -63623065376338346466306563323966663231363932643539393662336638383836383531653237 -37393731343166613261373434366231346365333536306338666230373763326361366137376333 -32663833653236653163653838666438636135376131316631343134356434373862666435666137 -34643139666233386338623936316338393039396134313034396466316565613631383636383062 -30633635616233353130663361636432333333373030656633616233313336353030363539616165 -39393136623762633266626262333863663930373730633332383037653935353936666139636165 -32363936613633323830636263326138653739633237303832393832356162666565 +37333066333331653137333937386636363239386366313738313764623064343834313431656231 +3139626564666462363137633764303732303466626236320a613861356538386132643562333131 +31633331616131346234366334656435646665333830386330643865323965343630326333646566 +3166353665376362630a636335386662323461323264393666376365336137323861356333306665 +34383261613433373636656661303862393533616439306132336364373434643063653336386535 +65313261376337346631663832326136663435623566626630356131663664613235636133306130 +65306232653736366164643161363766663565313433336432336630643538336236303133343966 +63666231643038313534316533353738316563316465656465633737666662326535393439383038 +38386666323334316266626538613836326465346632313666363762306235633464363063336237 +30306165326131326135316337663830663534396331376563646234393237393431626665313737 +38396131346136306162623762626462636639633165346163303866306535396663386562373330 +38396262393566323762353539616436356562373963643936303733613932653237633931623836 +32363765333132393936633332356336613330626532626635316334663935383134663761343437 +37626231643764316564633038653265626261356335396131303831346363323462626631363139 +38656538336639663266633039383533643037326230623238303064326166363130373138356633 +38643466643464353934356230363936646661383732323032336635663863636361303937363039 +31316465363462623230303665336139633466633730643664363038643363303861353235623239 +37653439393430343761306633643437326539363834363564336630303935346362356330326462 +38666266373833363366316364316439333862313964373731623733313865623330323964366638 +34346533346563313161336536633862346232353333396233633130393333363834656138333433 +35333736343733353331363139643266613732633165366166383864356466316263373535323762 +31336231383330346131373561303234616131333834616133346463626232363032366265626164 +61666430626532366465336639306231646338333861356638336337323066643462643137363063 +32636630326162373337633432623936343935633139643831346636663434376263663339343239 +66613734313532366534623765336163663131663064613561633666653865333565396163656465 +61323663336333626433376364633166623761333062663662666637373436326361623666633037 +61653965386531623933633436653638626662623734303337373164346332326436336466626561 +32623932393466316530366434303166333530633331303330313136373336646364366564316139 +33366365336233393834356338383266616563393461346264336539363131656331666534643363 +61626361373033316133663437323438623766633163643636393131323331653434613335376231 +33366138656239396639333564336165653663363133353765356365303235633835626134303033 +34323334383735663162663337323137363865616632653265663066656334373735323561363036 +33323538626565646332643939303538313830353530303364346261613534393438363566663330 +64613530376133623664386436353965626464656431656537633333623639396533396537303731 +65343566303734613630363663323161333534323131376637366162363166626638383934373638 +63383863363163326234633866303064653539623965623532303436393439626532666161363830 +30313664393366346534623037613331383661623837393330396562663963343531323332626534 +65356432616532303237626162323035353365383861373636303833663563346335386134633839 +31613861373665343534333463613663376137393866313031383764366537666633643932633266 +31383335356233623931346265643937653832393735613562353965656639376234323239386634 +32643666356632326639306461333137653233616538333566343135343162316132 -- 2.14.3

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 <abologna@redhat.com> --- 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 - - libvirt-freebsd-11 + machines: '{all_machines}' title: Libvirt Go local_env: | export TEST_ARGS="-tags api" diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml index eb1ee77..0a6f648 100644 --- a/projects/libvirt-perl.yaml +++ b/projects/libvirt-perl.yaml @@ -1,15 +1,7 @@ - project: name: libvirt-perl - 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 Perl jobs: - perl-makemaker-build-job: @@ -19,8 +11,4 @@ test_args: 'TEST_MAINTAINER=1' - perl-makemaker-rpm-job: parent_jobs: 'libvirt-perl-master-test' - machines: - - libvirt-centos-7 - - libvirt-fedora-26 - - libvirt-fedora-27 - - libvirt-fedora-rawhide + machines: '{rpm_machines}' diff --git a/projects/libvirt-python.yaml b/projects/libvirt-python.yaml index 26accf4..1e742da 100644 --- a/projects/libvirt-python.yaml +++ b/projects/libvirt-python.yaml @@ -1,15 +1,7 @@ - project: name: libvirt-python - 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 Python jobs: - python-distutils-build-job: @@ -18,8 +10,4 @@ parent_jobs: 'libvirt-python-master-build' - python-distutils-rpm-job: parent_jobs: 'libvirt-python-master-check' - machines: - - libvirt-centos-7 - - libvirt-fedora-26 - - libvirt-fedora-27 - - libvirt-fedora-rawhide + machines: '{rpm_machines}' diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index 4fcf849..86e84d1 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -1,18 +1,14 @@ - project: name: libvirt - machines: - - libvirt-centos-7 - - libvirt-debian-8 - - libvirt-debian-9 - - libvirt-fedora-26 - - libvirt-fedora-27 - - libvirt-fedora-rawhide + machines: '{all_machines}' title: Libvirt archive_format: xz jobs: - autotools-build-job: parent_jobs: + - autotools-syntax-check-job: + parent_jobs: 'libvirt-master-build' machines: - libvirt-centos-7 - libvirt-debian-8 @@ -20,22 +16,21 @@ - libvirt-fedora-26 - libvirt-fedora-27 - libvirt-fedora-rawhide - - libvirt-freebsd-10 - - libvirt-freebsd-11 - - autotools-syntax-check-job: - parent_jobs: 'libvirt-master-build' - autotools-check-job: parent_jobs: 'libvirt-master-syntax-check' - local_env: | - export VIR_TEST_EXPENSIVE=1 - export VIR_TEST_DEBUG=2 - - autotools-rpm-job: - parent_jobs: 'libvirt-master-check' machines: - libvirt-centos-7 + - libvirt-debian-8 + - libvirt-debian-9 - libvirt-fedora-26 - libvirt-fedora-27 - libvirt-fedora-rawhide + local_env: | + export VIR_TEST_EXPENSIVE=1 + export VIR_TEST_DEBUG=2 + - autotools-rpm-job: + parent_jobs: 'libvirt-master-check' + machines: '{rpm_machines}' - autotools-mingw-job: parent_jobs: machines: diff --git a/projects/osinfo-db-tools.yaml b/projects/osinfo-db-tools.yaml index e51a064..6b451ef 100644 --- a/projects/osinfo-db-tools.yaml +++ b/projects/osinfo-db-tools.yaml @@ -1,15 +1,7 @@ - project: name: osinfo-db-tools - 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: osinfo database tools jobs: - autotools-build-job: @@ -20,8 +12,4 @@ parent_jobs: 'osinfo-db-tools-master-syntax-check' - autotools-rpm-job: parent_jobs: 'osinfo-db-tools-master-check' - machines: - - libvirt-centos-7 - - libvirt-fedora-26 - - libvirt-fedora-27 - - libvirt-fedora-rawhide + machines: '{rpm_machines}' diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 0dd73b5..0f7dd22 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -1,15 +1,7 @@ - project: name: osinfo-db - 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: osinfo database jobs: - generic-build-job: @@ -19,11 +11,7 @@ $MAKE install OSINFO_DB_TARGET="--system" - generic-rpm-job: parent_jobs: 'osinfo-db-master-build' - machines: - - libvirt-centos-7 - - libvirt-fedora-26 - - libvirt-fedora-27 - - libvirt-fedora-rawhide + machines: '{rpm_machines}' command: | rm -f *.tar.xz $MAKE osinfo-db.spec diff --git a/projects/virt-viewer.yaml b/projects/virt-viewer.yaml index 90cd787..647b963 100644 --- a/projects/virt-viewer.yaml +++ b/projects/virt-viewer.yaml @@ -1,15 +1,7 @@ - project: name: virt-viewer - 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: Virt Viewer jobs: - autotools-build-job: @@ -20,8 +12,4 @@ parent_jobs: 'virt-viewer-master-syntax-check' - autotools-rpm-job: parent_jobs: 'virt-viewer-master-check' - machines: - - libvirt-centos-7 - - libvirt-fedora-26 - - libvirt-fedora-27 - - libvirt-fedora-rawhide + machines: '{rpm_machines}' -- 2.14.3