3:18 p.m.
Changes from [v1]:
* rebase on top of current master;
* perform pure code motions in a separate patch;
* clean up non-CI guests.
[v1] https://www.redhat.com/archives/libvir-list/2017-October/msg01045.html
Andrea Bolognani (5):
guests: Shuffle base steps around
guests: Use non-debug kernel on Fedora Rawhide
guests: Clean up non-CI guests
ansible: Use ansible_distribution_release on FreeBSD
guests: Add Debian sid and FreeBSD -CURRENT
guests/files/fedora-rawhide-kernel-nodebug.repo | 8 ++
guests/host_vars/libvirt-debian-sid/install.yml | 3 +
.../main.yml | 2 +-
.../main.yml | 11 ++-
guests/host_vars/libvirt-ubuntu-12/main.yml | 1 -
guests/host_vars/libvirt-ubuntu-14/main.yml | 1 -
guests/host_vars/libvirt-ubuntu-16/main.yml | 1 -
guests/tasks/base.yml | 61 +++++++++-----
guests/vars/mappings.yml | 3 +-
guests/vars/vault.yml | 98 ++++++++++------------
10 files changed, 107 insertions(+), 82 deletions(-)
create mode 100644 guests/files/fedora-rawhide-kernel-nodebug.repo
create mode 100644 guests/host_vars/libvirt-debian-sid/install.yml
copy guests/host_vars/{libvirt-ubuntu-16 => libvirt-debian-sid}/main.yml (94%)
copy guests/host_vars/{libvirt-ubuntu-16 => libvirt-freebsd-current}/main.yml (51%)
--
2.13.6
3:19 p.m.
New subject: [libvirt] [jenkins-ci PATCH v2 1/5] guests: Shuffle base steps around
We want to add extra repositories before updating the installed
packages; however, adding extra repositories might require the
libselinux-python package to be installed on some systems.
Reorder the steps so that the libselinux-python package is installed
before adding extra repositories, which in turn happens before
updating installed packages.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/tasks/base.yml | 48 ++++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml
index 572da9d..798d7cd 100644
--- a/guests/tasks/base.yml
+++ b/guests/tasks/base.yml
@@ -33,6 +33,30 @@
- ( os_name == 'CentOS' or
os_name == 'Fedora' )
+- name: Bootstrap the package module
+ command: apt-get install -y python-apt
+ args:
+ creates: /usr/lib/python2*/*-packages/apt
+ warn: no
+ when:
+ - package_format == 'deb'
+
+- name: Bootstrap the package module
+ command: dnf install -y python2-dnf
+ args:
+ creates: /usr/lib*/python2*/*-packages/dnf
+ warn: no
+ when:
+ - os_name == 'Fedora'
+
+- name: Permit file editing on SELinux-enabled systems
+ package:
+ name: libselinux-python
+ state: present
+ when:
+ - ( os_name == 'CentOS' or
+ os_name == 'Fedora' )
+
- name: Enable jessie-backports repository
copy:
src: files/jessie-backports.sources
@@ -53,22 +77,6 @@
- os_name == 'Debian'
- os_version == '8'
-- name: Bootstrap the package module
- command: apt-get install -y python-apt
- args:
- creates: /usr/lib/python2*/*-packages/apt
- warn: no
- when:
- - package_format == 'deb'
-
-- name: Bootstrap the package module
- command: dnf install -y python2-dnf
- args:
- creates: /usr/lib*/python2*/*-packages/dnf
- warn: no
- when:
- - os_name == 'Fedora'
-
- name: Update installed packages
package:
name: '*'
@@ -106,14 +114,6 @@
with_items:
- nano
-- name: Permit file editing on SELinux-enabled systems
- package:
- name: libselinux-python
- state: present
- when:
- - ( os_name == 'CentOS' or
- os_name == 'Fedora' )
-
- name: Configure hostname
hostname:
name: '{{ inventory_hostname }}'
--
2.13.6
3:19 p.m.
New subject: [libvirt] [jenkins-ci PATCH v2 2/5] guests: Use non-debug kernel on Fedora Rawhide
By default, Fedora Rawhide uses a kernel with a lot of debug options
enable. This is very useful for the development of Rawhide itself,
but also causes a pretty significant performance penalty.
Enable the fedora-rawhide-kernel-nodebug, with higher than default
priority, to make sure the non-debug kernels are picked up instead
of the debug ones.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/files/fedora-rawhide-kernel-nodebug.repo | 8 ++++++++
guests/tasks/base.yml | 10 ++++++++++
2 files changed, 18 insertions(+)
create mode 100644 guests/files/fedora-rawhide-kernel-nodebug.repo
diff --git a/guests/files/fedora-rawhide-kernel-nodebug.repo
b/guests/files/fedora-rawhide-kernel-nodebug.repo
new file mode 100644
index 0000000..76198dc
--- /dev/null
+++ b/guests/files/fedora-rawhide-kernel-nodebug.repo
@@ -0,0 +1,8 @@
+[fedora-rawhide-kernel-nodebug]
+name=Rawhide kernels built without debugging turned on
+baseurl=https://dl.fedoraproject.org/pub/alt/rawhide-kernel-nodebug/$basearch
+enabled=1
+skip_if_unavailable=0
+metadata_expire=6h
+gpgcheck=0
+priority=90
diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml
index 798d7cd..1604cd0 100644
--- a/guests/tasks/base.yml
+++ b/guests/tasks/base.yml
@@ -77,6 +77,16 @@
- os_name == 'Debian'
- os_version == '8'
+- name: Enable fedora-rawhide-kernel-nodebug repository
+ copy:
+ src: files/fedora-rawhide-kernel-nodebug.repo
+ dest: /etc/yum.repos.d/fedora-rawhide-kernel-nodebug.repo
+ owner: root
+ group: root
+ when:
+ - os_name == 'Fedora'
+ - os_version == 'Rawhide'
+
- name: Update installed packages
package:
name: '*'
--
2.13.6
3:19 p.m.
New subject: [libvirt] [jenkins-ci PATCH v2 3/5] guests: Clean up non-CI guests
Guests that are not part of the libvirt CI setup don't need to
install Java, configure the Jenkins agent or have a Jenkins secret
associated with them.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/host_vars/libvirt-ubuntu-12/main.yml | 1 -
guests/host_vars/libvirt-ubuntu-14/main.yml | 1 -
guests/host_vars/libvirt-ubuntu-16/main.yml | 1 -
guests/vars/mappings.yml | 3 +-
guests/vars/vault.yml | 98 +++++++++++++----------------
5 files changed, 46 insertions(+), 58 deletions(-)
diff --git a/guests/host_vars/libvirt-ubuntu-12/main.yml
b/guests/host_vars/libvirt-ubuntu-12/main.yml
index 8873530..4d53bb3 100644
--- a/guests/host_vars/libvirt-ubuntu-12/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-12/main.yml
@@ -1,5 +1,4 @@
---
projects:
- base
- - jenkins
- libvirt
diff --git a/guests/host_vars/libvirt-ubuntu-14/main.yml
b/guests/host_vars/libvirt-ubuntu-14/main.yml
index fd1d7ee..18b013d 100644
--- a/guests/host_vars/libvirt-ubuntu-14/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-14/main.yml
@@ -1,7 +1,6 @@
---
projects:
- base
- - jenkins
- libosinfo
- libvirt
- libvirt-perl
diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml
b/guests/host_vars/libvirt-ubuntu-16/main.yml
index f00a9d5..7baecf7 100644
--- a/guests/host_vars/libvirt-ubuntu-16/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-16/main.yml
@@ -1,7 +1,6 @@
---
projects:
- base
- - jenkins
- libosinfo
- libvirt
- libvirt-glib
diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index 8ce7ff2..e78277a 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -174,8 +174,7 @@ mappings:
deb: openjdk-8-jre-headless
pkg: openjdk8-jre
rpm: java-1.8.0-openjdk-headless
- Ubuntu12: openjdk-7-jre-headless
- Ubuntu14: openjdk-7-jre-headless
+ Ubuntu:
libacl:
deb: libacl1-dev
diff --git a/guests/vars/vault.yml b/guests/vars/vault.yml
index 62f6fb5..abcfe81 100644
--- a/guests/vars/vault.yml
+++ b/guests/vars/vault.yml
@@ -1,54 +1,46 @@
$ANSIBLE_VAULT;1.1;AES256
-36343464383430343730353537646435373935336634613536333665663735636434366463646338
-3738333139626366383661303364356539633537333733350a323434666637363638396538303532
-61303230643230396563613564656163336630316462356461616262643036353964356264363631
-3862653531383164360a303766396239393636343831343535336636356461623366633031336361
-38633563313134656339666632383666653536353331303563323335326230633466366365386361
-37656634373533336333646230386365353630353833333839306433373061623631633737663636
-63343733353663386338663730353466656135373837336530616330346433623236326462636366
-34623966343662396131373665363631323061663536646133653433646666373637613338313165
-31313364623237326562653065343264386635343732366234633061613936393132323161346136
-61303534313837353238643864643432663937346266636165393330643962656532626137653532
-37306565313633373861396230646232663639353833326562336438383764333831303464393161
-63356534393362393563346435393536653933663535306337623033323932306236346638626262
-31316366666464323430356638383539343466663938663866366233623134356265386664356433
-33363663313866626366376136616166656565336438663234663536306661633937346532323831
-62373431656231313232393836616234366638633939623933666361326664636265386539396565
-64626365333631313238333562646533313466613433666331636566366431666336643766373237
-30626633356632623230616135356162663339356663306334306131333964633931343936356436
-30623839326163656336646232636364373762353562396664313365326637356466303235656465
-30323330396134666338323363633762366536353063646563343161646632646137383537373135
-31343162366464626563663132316332633534313535626264366136633764393636626662663730
-64346139363239623363313165623335626338323236613164613862623632303635643264613135
-61306436626638316364303338373063643864386531376235666465396266646333616538613536
-36626661363233393463393466313437316230343966303834343965386430306664653265336234
-31313239313661313962643638613637636265303861383434353439666233373537343830313162
-66666637393637356661383265653065653331623839336639383137396637626139346235616361
-64646465393730623465663938626264373337313633323934343561353830636432656238323735
-62393531363235643331383538663735326464346639323831323364636139663961313935323635
-30343166613139323464333062336162303333656666383238363835643534316162353634616165
-33326366303539646438313630396438396136326130666330383335396432643862616662333735
-37366332623932363262366464623861303035623861376334656234373433363833386333666665
-61326133656562656561333763343333663730653735326430383965353565313965373635633534
-32623438656132353832326265306331303265613232323835663339306266303333366362303739
-39613932653661623831663531373531663261653736343066336637313930646331373035333132
-30313962376461643035326138343432633962373639326336313261353132656365643661373333
-39363035626634303738346233346561623531373538666639646533623933613733626534626338
-62343039313335313037396132663337383035313363663134666430656333343234313564323436
-64393631323537353061623034366237626538653530626134353465383533303861323539613936
-38376161383434346533303639633063356634633233333835643534363365613162323164316432
-31356232313832326539326437663430316634363431303837393965393936656334343037653364
-62363033303731343132343334653834316264313235306430636335383831623136626665376239
-63653938323736313963393164353366313930303730666136626130393463653064336639343766
-66633733656534303666316638383336366138343831313063643732636437313564336637633765
-30313365303732316561303665643732616433386639666231633332616435373061313161636633
-36633062623163393234303563306363303831353437363535393633303930656665323761313834
-31623935643063613536653532653766313235396366333231353234323565646461343930393839
-37303130633439396364656261333135663764666164623130666664666133623361323930396334
-32376639373234633532343764656438303939343538363031326633656561333937396164323963
-63633839376136633131353137646133303566386466303035353236303930356163313666616539
-37336132663033343165663566663636376233346264346363666131336330393064396563346335
-33636130333135613764643862663836336461383136666361663135373933373539653131653338
-30656233656464643438636635373139323061616561386638663431633861303362343762626338
-37326334363764633232633538343434353661616632626336343134313332383936353161616535
-6463
+64343731373437366531636566663438363261343431663139383066646464636533653936383962
+3936346536323236363365306639613464303566373464650a663236353065366666303666363431
+35363464613031346338336437383930353839346162316261613835636138356361626439616638
+6237623363383330370a663732313138623732393534316164653039323430363964306666326334
+33343861306562663037653436666361396131656434393261366664623539313831373033313231
+65633265366230363139666533333264343364316564623766346134646233656434313839393838
+39623862643537633238376362373038636666393165326261353434373763626233356438623338
+36376266626134336165633065303762346136386461376466633563386666366636613534653632
+63613931383035613133613564356232386565326534356366656633373338663963356236343964
+38626531336238663666326531383333396139646339323835346231633636346563313161343133
+30393339326666613030326636663365313536366439336137363031343032643939616161396361
+31636664366631383831323438373265343531653539366331643461646239386261333333343236
+32616664396530653736643865666138333136373139323438636566386664656137323261633765
+61356639623161386235613333303335643864373131393663303335316132663632626530653036
+30313062316466373230626437666433366162656461356336393232353737396166316564666438
+36666633623032363330613464376336313264623132636430646334663435393039656233396336
+66343161656564323538386132366634303564303038623033656362643562653265343863303939
+32323362386436343133336639303666336235346265653666366331643939663034336662656435
+30393232386531353532353139393037303333396662313564323731363537316261333730326635
+61393866386233633261653630653930376564373734373334313764396339353161396463613032
+31376239366431386538636663616533306362646134336434346231386638363765613631383035
+31313439353863396365646639383834313961653038316333613337663134396239303866666236
+63313363306561373936343832373037336635313565313664356331616461353637633131333464
+34366332356463646230613133353361363766616635616234656666373639333936653639373535
+30316365373839353563343133613061326237313265383331623834633133633034663934333364
+64393335333738303262323234663135636235396265656335323934363534323636643934613866
+61386137303135613734633064383638316131383631653333366632356133646231623534313134
+36386339323638646266626137613032333738333739636439653334363333343437633964613738
+61363336333966663731313362366165323034303538323037623735346239303663623361643432
+63376236663963343231653031373961313732393833323932316533616165623336386337643363
+36666236623435396332386538616139653430666130386562373735626435373665346630643831
+35303533626537396330346530656234363830383330353234386234353163306637653938646635
+31666631326132343030393763633362343738303030343032326435386165346463666662336130
+33353030323438346437396632616234333333623136373563343965383235626337643164393361
+65313463336237636433333835326363663335396238356663346233666430373530396266336630
+31393036383431303631333365663961303639323635376236313531626638323864656438613138
+32303230313930613363323330623936343531393034616634323439303765623938366661613561
+30313633363764646362343862333766616465656465303132313166666239373238633134383131
+32656664383230333263396537373636663337346638306634613862373365653534666362383139
+64313735646636393866386230373232363635623333613833306165663136613162393730356565
+35393238663531366634636139616563303336653733353832336138656663653764636462316561
+64653935656134636139396262316461383765623334353664306165316130393462383863643133
+39313538396337633136353637366632653731643665666161396164636566366136396261663264
+62626464353231306435666339663939323733346165333663363765363835323864306264393561
+63303731383339396366353761316435396466613732646633616438346336623863
--
2.13.6
3:19 p.m.
New subject: [libvirt] [jenkins-ci PATCH v2 4/5] ansible: Use ansible_distribution_release on FreeBSD
In general, we can rely on ansible_distribution_major_version for a
quick way to figure out the OS version; however, when it comes to
FreeBSD's -CURRENT snapshots, that variable is not available, which
causes the playbook to fail.
Work around the problem by always extracting the OS version from
ansible_distribution_release, which is available even on -CURRENT.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/tasks/base.yml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml
index 1604cd0..8d7ff44 100644
--- a/guests/tasks/base.yml
+++ b/guests/tasks/base.yml
@@ -4,6 +4,7 @@
os_name: '{{ ansible_distribution }}'
os_version: '{{ ansible_distribution_major_version }}'
when:
+ - ansible_distribution != 'FreeBSD'
- ansible_distribution_release != 'Rawhide'
- name: Set additional facts (OS)
@@ -11,8 +12,16 @@
os_name: '{{ ansible_distribution }}'
os_version: Rawhide
when:
+ - ansible_distribution != 'FreeBSD'
- ansible_distribution_release == 'Rawhide'
+- name: Set additional facts (OS)
+ set_fact:
+ os_name: '{{ ansible_distribution }}'
+ os_version: '{{
ansible_distribution_release|regex_replace("^(\d+)\.\d+-.*$", "\1")
}}'
+ when:
+ - ansible_distribution == 'FreeBSD'
+
- name: Set additional facts (package format)
set_fact:
package_format: deb
--
2.13.6
3:19 p.m.
New subject: [libvirt] [jenkins-ci PATCH v2 5/5] guests: Add Debian sid and FreeBSD -CURRENT
We already have support for Fedora's development branch; it only
makes sense to include Debian's and FreeBSD's as well.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/host_vars/libvirt-debian-sid/install.yml | 3 +++
guests/host_vars/libvirt-debian-sid/main.yml | 16 ++++++++++++++++
guests/host_vars/libvirt-freebsd-current/main.yml | 23 +++++++++++++++++++++++
3 files changed, 42 insertions(+)
create mode 100644 guests/host_vars/libvirt-debian-sid/install.yml
create mode 100644 guests/host_vars/libvirt-debian-sid/main.yml
create mode 100644 guests/host_vars/libvirt-freebsd-current/main.yml
diff --git a/guests/host_vars/libvirt-debian-sid/install.yml
b/guests/host_vars/libvirt-debian-sid/install.yml
new file mode 100644
index 0000000..da1c7a8
--- /dev/null
+++ b/guests/host_vars/libvirt-debian-sid/install.yml
@@ -0,0 +1,3 @@
+---
+install_url: http://deb.debian.org/debian/dists/sid/main/installer-amd64/
+install_config: preseed.cfg
diff --git a/guests/host_vars/libvirt-debian-sid/main.yml
b/guests/host_vars/libvirt-debian-sid/main.yml
new file mode 100644
index 0000000..ff28698
--- /dev/null
+++ b/guests/host_vars/libvirt-debian-sid/main.yml
@@ -0,0 +1,16 @@
+---
+projects:
+ - base
+ - libosinfo
+ - libvirt
+ - libvirt-glib
+ - libvirt-go
+ - libvirt-go-xml
+ - libvirt-perl
+ - libvirt-python
+ - libvirt-sandbox
+ - libvirt-tck
+ - osinfo-db
+ - osinfo-db-tools
+ - virt-manager
+ - virt-viewer
diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml
b/guests/host_vars/libvirt-freebsd-current/main.yml
new file mode 100644
index 0000000..3848c3d
--- /dev/null
+++ b/guests/host_vars/libvirt-freebsd-current/main.yml
@@ -0,0 +1,23 @@
+---
+ansible_python_interpreter: /usr/local/bin/python2
+
+bash: /usr/local/bin/bash
+java: /usr/local/bin/java
+make: /usr/local/bin/gmake
+su: /usr/bin/su
+sudoers: /usr/local/etc/sudoers
+
+projects:
+ - base
+ - libosinfo
+ - libvirt
+ - libvirt-glib
+ - libvirt-go
+ - libvirt-go-xml
+ - libvirt-perl
+ - libvirt-python
+ - libvirt-tck
+ - osinfo-db
+ - osinfo-db-tools
+ - virt-manager
+ - virt-viewer
--
2.13.6
5:55 p.m.
On Mon, Oct 23, 2017 at 03:18:59PM +0200, Andrea Bolognani wrote:
Changes from [v1]:
* rebase on top of current master;
* perform pure code motions in a separate patch;
* clean up non-CI guests.
[v1] https://www.redhat.com/archives/libvir-list/2017-October/msg01045.html
Andrea Bolognani (5):
guests: Shuffle base steps around
guests: Use non-debug kernel on Fedora Rawhide
guests: Clean up non-CI guests
ansible: Use ansible_distribution_release on FreeBSD
guests: Add Debian sid and FreeBSD -CURRENT
Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
2523
days inactive
2523
days old
6 comments
2 participants
participants (2)
-
Andrea Bolognani -
Pavel Hrdina