The version check was not written in a future-proof manner, as all versions of FreeBSD after 10 need the kludge. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- guests/playbooks/update/tasks/kludges.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guests/playbooks/update/tasks/kludges.yml b/guests/playbooks/update/tasks/kludges.yml index 0ad61a7..f9127ac 100644 --- a/guests/playbooks/update/tasks/kludges.yml +++ b/guests/playbooks/update/tasks/kludges.yml @@ -15,8 +15,8 @@ when: - os_name == 'FreeBSD' -# Same as above, except we only need to do it on FreeBSD 11 because -# FreeBSD 10 shipped (an old version of) readline in the base system +# Same as above, except we should skip it on FreeBSD 10 because it +# shipped (an old version of) readline in the base system - name: Create compatibility symlinks file: src: '/usr/local/{{ item }}' @@ -28,7 +28,7 @@ - lib/libreadline.so when: - os_name == 'FreeBSD' - - os_version == '11' + - os_version != '10' # FreeBSD compiles bash without defining SSH_SOURCE_BASHRC, which means # it won't try to detect when it's spawned by ssh and source ~/.bashrc -- 2.19.2

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- guests/playbooks/build/jobs/defaults.yml | 1 + guests/playbooks/build/projects/libvirt-dbus.yml | 2 ++ guests/playbooks/build/projects/libvirt-ocaml.yml | 1 + guests/playbooks/build/projects/libvirt-tck.yml | 1 + guests/playbooks/build/projects/virt-manager.yml | 1 + jobs/defaults.yaml | 1 + projects/libvirt-dbus.yaml | 2 ++ projects/libvirt-ocaml.yaml | 1 + projects/libvirt-tck.yaml | 1 + projects/virt-manager.yaml | 1 + 10 files changed, 12 insertions(+) diff --git a/guests/playbooks/build/jobs/defaults.yml b/guests/playbooks/build/jobs/defaults.yml index d9e81e0..cc1429f 100644 --- a/guests/playbooks/build/jobs/defaults.yml +++ b/guests/playbooks/build/jobs/defaults.yml @@ -9,6 +9,7 @@ all_machines: - libvirt-fedora-rawhide - libvirt-freebsd-10 - libvirt-freebsd-11 + - libvirt-freebsd-12 - libvirt-freebsd-current - libvirt-ubuntu-16 - libvirt-ubuntu-18 diff --git a/guests/playbooks/build/projects/libvirt-dbus.yml b/guests/playbooks/build/projects/libvirt-dbus.yml index 41e670c..4b27c50 100644 --- a/guests/playbooks/build/projects/libvirt-dbus.yml +++ b/guests/playbooks/build/projects/libvirt-dbus.yml @@ -11,6 +11,7 @@ - libvirt-fedora-rawhide - libvirt-freebsd-10 - libvirt-freebsd-11 + - libvirt-freebsd-12 - libvirt-freebsd-current - libvirt-ubuntu-16 - libvirt-ubuntu-18 @@ -44,6 +45,7 @@ - libvirt-fedora-rawhide - libvirt-freebsd-10 - libvirt-freebsd-11 + - libvirt-freebsd-12 - libvirt-freebsd-current - libvirt-ubuntu-18 - include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml' diff --git a/guests/playbooks/build/projects/libvirt-ocaml.yml b/guests/playbooks/build/projects/libvirt-ocaml.yml index bb70d47..3ee8dad 100644 --- a/guests/playbooks/build/projects/libvirt-ocaml.yml +++ b/guests/playbooks/build/projects/libvirt-ocaml.yml @@ -11,6 +11,7 @@ - libvirt-fedora-rawhide - libvirt-freebsd-10 - libvirt-freebsd-11 + - libvirt-freebsd-12 - libvirt-freebsd-current - libvirt-ubuntu-16 - libvirt-ubuntu-18 diff --git a/guests/playbooks/build/projects/libvirt-tck.yml b/guests/playbooks/build/projects/libvirt-tck.yml index 4e40565..03e7957 100644 --- a/guests/playbooks/build/projects/libvirt-tck.yml +++ b/guests/playbooks/build/projects/libvirt-tck.yml @@ -10,6 +10,7 @@ - libvirt-fedora-rawhide - libvirt-freebsd-10 - libvirt-freebsd-11 + - libvirt-freebsd-12 - libvirt-freebsd-current - libvirt-ubuntu-16 - libvirt-ubuntu-18 diff --git a/guests/playbooks/build/projects/virt-manager.yml b/guests/playbooks/build/projects/virt-manager.yml index 432f6eb..1256557 100644 --- a/guests/playbooks/build/projects/virt-manager.yml +++ b/guests/playbooks/build/projects/virt-manager.yml @@ -12,6 +12,7 @@ - libvirt-fedora-rawhide - libvirt-freebsd-10 - libvirt-freebsd-11 + - libvirt-freebsd-12 - libvirt-freebsd-current - libvirt-ubuntu-18 archive_format: gz diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml index b5cf4f2..e3664a9 100644 --- a/jobs/defaults.yaml +++ b/jobs/defaults.yaml @@ -11,6 +11,7 @@ - libvirt-fedora-rawhide - libvirt-freebsd-10 - libvirt-freebsd-11 + - libvirt-freebsd-12 rpm_machines: - libvirt-centos-7 - libvirt-fedora-28 diff --git a/projects/libvirt-dbus.yaml b/projects/libvirt-dbus.yaml index 3d1ed9c..d559c05 100644 --- a/projects/libvirt-dbus.yaml +++ b/projects/libvirt-dbus.yaml @@ -10,6 +10,7 @@ - libvirt-fedora-rawhide - libvirt-freebsd-10 - libvirt-freebsd-11 + - libvirt-freebsd-12 title: Libvirt D-Bus archive_format: xz git_url: '{git_urls[libvirt-dbus][default]}' @@ -37,6 +38,7 @@ - libvirt-fedora-rawhide - libvirt-freebsd-10 - libvirt-freebsd-11 + - libvirt-freebsd-12 - autotools-rpm-job: parent_jobs: 'libvirt-dbus-check' machines: '{rpm_machines}' diff --git a/projects/libvirt-ocaml.yaml b/projects/libvirt-ocaml.yaml index 1372fe9..36bc7c9 100644 --- a/projects/libvirt-ocaml.yaml +++ b/projects/libvirt-ocaml.yaml @@ -10,6 +10,7 @@ - libvirt-fedora-rawhide - libvirt-freebsd-10 - libvirt-freebsd-11 + - libvirt-freebsd-12 title: Libvirt OCaml archive_format: xz git_url: '{git_urls[libvirt-ocaml][default]}' diff --git a/projects/libvirt-tck.yaml b/projects/libvirt-tck.yaml index f6e3775..f9edc64 100644 --- a/projects/libvirt-tck.yaml +++ b/projects/libvirt-tck.yaml @@ -11,6 +11,7 @@ - libvirt-fedora-rawhide - libvirt-freebsd-10 - libvirt-freebsd-11 + - libvirt-freebsd-12 title: Libvirt TCK archive_format: gz git_url: '{git_urls[libvirt-tck][default]}' diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index 224e821..bd6c8e1 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -11,6 +11,7 @@ - libvirt-fedora-rawhide - libvirt-freebsd-10 - libvirt-freebsd-11 + - libvirt-freebsd-12 title: Virtual Machine Manager archive_format: gz git_url: '{git_urls[virt-manager][default]}' -- 2.19.2

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- guests/host_vars/libvirt-freebsd-10/main.yml | 22 ----- guests/inventory | 1 - guests/vars/vault.yml | 86 ++++++++++---------- 3 files changed, 41 insertions(+), 68 deletions(-) delete mode 100644 guests/host_vars/libvirt-freebsd-10/main.yml diff --git a/guests/host_vars/libvirt-freebsd-10/main.yml b/guests/host_vars/libvirt-freebsd-10/main.yml deleted file mode 100644 index 6547ab4..0000000 --- a/guests/host_vars/libvirt-freebsd-10/main.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -ansible_python_interpreter: /usr/local/bin/python2 - -projects: - - libosinfo - - libvirt - - libvirt-dbus - - libvirt-glib - - libvirt-go - - libvirt-go-xml - - libvirt-ocaml - - libvirt-perl - - libvirt-python - - libvirt-tck - - osinfo-db - - osinfo-db-tools - - virt-manager - - virt-viewer - -package_format: pkg -os_name: FreeBSD -os_version: 10 diff --git a/guests/inventory b/guests/inventory index 252666e..7619ffc 100644 --- a/guests/inventory +++ b/guests/inventory @@ -5,7 +5,6 @@ libvirt-debian-sid libvirt-fedora-28 libvirt-fedora-29 libvirt-fedora-rawhide -libvirt-freebsd-10 libvirt-freebsd-11 libvirt-freebsd-12 libvirt-freebsd-current diff --git a/guests/vars/vault.yml b/guests/vars/vault.yml index 59caa53..4229056 100644 --- a/guests/vars/vault.yml +++ b/guests/vars/vault.yml @@ -1,46 +1,42 @@ $ANSIBLE_VAULT;1.1;AES256 -63633637333233376433313132376136663030393330643762616339326638653730643037656565 -6464376661333237303566346539393565386333376261620a646631346130303639666630333464 -34363138386335363231363732346262613736306139346263623937613930623236336237386363 -3531303936343239360a376665353935363863306432623262333931666636306135666638373335 -32613765643431653531383237323639306536393766646263336661303161656331386362393630 -64386238336532383033303465333139663366353935656337663063613363386366386561323134 -66663634653935376531376465396333333032656638306661343435396634396266383332653134 -66343265646333363537353262356239393138343361343466613265313036643035633734333466 -35663730663832353962356534653738653434633861653834353263323965326231393931333336 -37313436333530336365356533643438616637666439336561303838306537626335653531316665 -34356563323563656631353037373663303138323366356632323332326234333266626535623137 -32303361656232643065636639383866363631646666323436376239303961663863383035336431 -62356331383064373530623666353166376239303139656263613461626532303465313066616437 -36306266626432393865393433366430383665303735313731643962346134316331346437303733 -31386465646234653337336333366430383361343864363730316562393265396266663333636334 -61616535626239363961393464356636646362333936343262623162616438363638333534393237 -33363836376138373333653865663333383937323936633131316162386265346130633631613161 -65366338303834666135343933623366643038313734643561373230613137663838663930393765 -32663233636364313764616262363565303435396631356363653735626363663534303065376262 -33346436303462623763303439636136666333386664616565663533636632366335376265386134 -37353063646335633731313261616234633938356461366565336330353037646138366231356434 -64336334313436313163363864373733646363313839373664616631303232313732636633303566 -30656236343963646631383639323836653565323831383832363237313464323933326536636338 -30663837636634626261663761646534393762656666633563323337646265643530626134393065 -39663333316532626437303830356130333938396430336163666635666635326135396236633461 -36306234626134383635616233346536353962643236663838626130323831336432343833633536 -66626432623831376161323432303232343438393138303031663432623865633239386330343061 -64373765613137666466636136323832373266333131646530393865383361366235623932636166 -35316563353766366530636234396431626435666137323638303866663736666132306434396138 -32333464643233363461653833376466313161353966326538393036353164633530653635333966 -31356234396636383837306639336537303332663664303165613336613430333539306431616334 -38626630623666323765376633326264666161303561343266396432306263336432373766613266 -31326230333535663632633530316537313035663562646133653566303836326133666666393564 -37383434363135343739373864666635656638306639353337333566343366643639323930656361 -64366163393831643063363734313266656464303036306231373262326231613130333533663430 -35643739643939386363616433633365656164653737636631326232646561356134613033383635 -39346633643235333732383966353263653934653538343763313635303239303835393232656238 -64393637373265623533343766333338623830316230396536386633623238353065373238626565 -36313764346437353066653530626632623031316263633362376435326263356361333766616131 -64366362373230393666633835396638336165643064303134303865663535613333663735633564 -65396139386235656431663862656433303531613166396333303333313939356165383631336630 -33666631333235363839346538393632653561346630643963643338633534616135656162333963 -33663438353434613538623334613732383366316135383763643965633331653330376164623862 -66646562363064396162346465646434363666333531303534633333316637636134373465653365 -36636163353732366633623530313830623830383538653762646137623935613562 +34653262643236653630616233396231366465363137396438363234336539366631666430363735 +3738616330663632323663303738323739366234623932360a306233666539653734353635626334 +39386438383137366436313865623861336331366164383439303466653639383636376265656137 +6133366231346131390a333066333433626630623766383238666630366633353232663430613161 +64373231333739613763303664383233333732636438643234343635356466376234663735356433 +37663038653238386362666536316635363466663266323461376331663735656263643337663161 +31323435323666313665616533393335626638656134303937396232633636393936636439653561 +65323365353531663438646538343537616236363631326666376232313162613134623766353162 +38666262346261306439383235333765613834356231336430306533613262376137333430643062 +62666633343734643636346135303137666263316333656665383837303133613037323266643664 +36373234636466393630393836653538613332306434396533343162396262346234623965373732 +39663634336239616538653337383135613534623462623230633861303764326561646531643636 +30386263626165386361366135333261323435386334613232346533376461656134376636613135 +33646432386632306133383862653065643134303030313032643962316534383366613364316234 +33353765626565386536373634613564383138393164336236343537353936373230653634656238 +35356238656235363235653837393862376335376338636361653535383432613961353832386234 +30336136326163303234333662313666306238383761303836616138343165656264363637383465 +33646561303366313132636633393231393966356633323464396639623066323337326534373835 +62663235343264623564316439343739663565383338373739643966343134643930346366666232 +39633631353365666464323138323036353666636230626563633733656461613736316639366137 +66326234306137653864643263616334316233663761366239346432356463336530326432326238 +30323330643838363631343865663238653335633862316639393237326566613863653834623334 +63613538326332376633376364653033623335356462383231303062643837663332393262613265 +32346635313130306134363133313134336666343439616636306237393466313362366135643862 +38376136323833363737396637336436366338373431333765373738396234626663386538353530 +66626337633337323563343666633131323235396564393534393234373530303135373335643338 +36366264323930396236663932383764313633353663313236376366653237333432333263643962 +63366438343662343331323861313838323837633238356431313034373132363434336536316536 +36646461323832363134386538353130363563373139333734346632346265373530373532643462 +33313661646533303636646337346232356437393334396436343162646631303537383466353230 +62633964303165626636373766616261313036666230306132626239623366346662373061613463 +30633637653838646133346261633934646665666161363137313362626638363961313935633464 +63363762356564393239353232386230313464336364393066646632316265313764393430323037 +33643830613565343263323233656333646161313062666461396264316538626339376339303232 +35653466346533633435613934326538323166613139393166623434326134353238333736383134 +62316266633137356265643638623862373332353665326235316139646362336530373834353966 +62633062303966666230303931653461653331383731376165633030396131363062356163303335 +61353861343338303233373536333331356234656138616561653465646262313662636630313134 +63616465393735623861383564383338626333653763366564396133356664396662653331303632 +62383438366330346261303264326636366239313864343261343364383237626663356262616230 +64376530353433643865626635666332356138623037633935656437653530613461 -- 2.19.2