+1 On 22 March 2018 at 15:20, Kevin Fenzi <kevin@xxxxxxxxx> wrote: > From f5934de9f70bc1b31348091bd69279f143f7ef78 Mon Sep 17 00:00:00 2001 > From: Kevin Fenzi <kevin@xxxxxxxxx> > Date: Thu, 22 Mar 2018 19:13:23 +0000 > Subject: [PATCH] Per https://pagure.io/releng/issue/7326 move the power > builders oz config to use just 1 cpu for now. There is a bug in nested virt > with more than 1 cpu that is causing all the images to fail to build. > Note that all these images are non release blocking and are currently > failing in f28 and rawhide, so there's not much downside. > > Signed-off-by: Kevin Fenzi <kevin@xxxxxxxxx> > --- > roles/koji_builder/files/oz.cfg | 22 ---------------------- > roles/koji_builder/tasks/main.yml | 2 +- > roles/koji_builder/templates/oz.cfg.j2 | 26 ++++++++++++++++++++++++++ > 3 files changed, 27 insertions(+), 23 deletions(-) > delete mode 100644 roles/koji_builder/files/oz.cfg > create mode 100644 roles/koji_builder/templates/oz.cfg.j2 > > diff --git a/roles/koji_builder/files/oz.cfg > b/roles/koji_builder/files/oz.cfg > deleted file mode 100644 > index 3d045d2..0000000 > --- a/roles/koji_builder/files/oz.cfg > +++ /dev/null > @@ -1,22 +0,0 @@ > -[paths] > -output_dir = /var/lib/libvirt/images > -data_dir = /var/lib/oz > -screenshot_dir = /var/lib/oz/screenshots > -# sshprivkey = /etc/oz/id_rsa-icicle-gen > - > -[libvirt] > -uri = qemu:///system > -image_type = raw > -# type = kvm > -# bridge_name = virbr0 > -cpus = 2 > -memory = 3096 > - > -[cache] > -original_media = yes > -modified_media = no > -jeos = no > - > -[icicle] > -safe_generation = no > - > diff --git a/roles/koji_builder/tasks/main.yml > b/roles/koji_builder/tasks/main.yml > index 75c427c..c573739 100644 > --- a/roles/koji_builder/tasks/main.yml > +++ b/roles/koji_builder/tasks/main.yml > @@ -154,7 +154,7 @@ > > # oz.cfg upstream ram and cpu definitions are not enough > - name: oz.cfg > - copy: src=oz.cfg dest=/etc/oz/oz.cfg > + template: src=oz.cfg dest=/etc/oz/oz.cfg > tags: > - koji_builder > > diff --git a/roles/koji_builder/templates/oz.cfg.j2 > b/roles/koji_builder/templates/oz.cfg.j2 > new file mode 100644 > index 0000000..b3dacc8 > --- /dev/null > +++ b/roles/koji_builder/templates/oz.cfg.j2 > @@ -0,0 +1,26 @@ > +[paths] > +output_dir = /var/lib/libvirt/images > +data_dir = /var/lib/oz > +screenshot_dir = /var/lib/oz/screenshots > +# sshprivkey = /etc/oz/id_rsa-icicle-gen > + > +[libvirt] > +uri = qemu:///system > +image_type = raw > +# type = kvm > +# bridge_name = virbr0 > +{% if ansible_architecture == 'ppc64' or ansible_architecture == > 'ppc64le' %} > +cpus = 1 > +{% elif %} > +cpus = 2 > +{% endif %} > +memory = 3096 > + > +[cache] > +original_media = yes > +modified_media = no > +jeos = no > + > +[icicle] > +safe_generation = no > + > -- > 1.8.3.1 > > > _______________________________________________ > infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx > To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx > -- Stephen J Smoogen. _______________________________________________ infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
