[sysadmin-notify] [ansible] Rework builders group

commit a5fb6ad428d07bd828e887469ef54bd64e1204a3 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Wed Jul 31 13:12:15 2019 +0200 Rework builders group inventory/builders | 58 ++++++++++++++++------------------------- playbooks/groups/buildhw.yml | 2 +- playbooks/groups/buildvm.yml | 2 +- 3 files changed, 25 insertions(+), 37 deletions(-) --- diff --git a/inventory/builders b/inventory/builders index c151f1b..8f9a40b 100644 --- a/inventory/builders +++ b/inventory/builders @@ -1,4 +1,4 @@ -[buildaarch64] +[buildhw_aarch64] aarch64-01.linaro.rpmfusion.net ansible_user=fedora ansible_become=yes ansible_python_interpreter=/usr/bin/python3 aarch64-02.linaro.rpmfusion.net ansible_user=fedora ansible_become=yes ansible_python_interpreter=/usr/bin/python3 aarch64-03.linaro.rpmfusion.net ansible_user=fedora ansible_become=yes ansible_python_interpreter=/usr/bin/python3 @@ -6,62 +6,48 @@ aarch64-04.linaro.rpmfusion.net ansible_user=fedora ansible_become=yes ansible_p aarch64-jetson-tx1.home.rpmfusion.net aarch64-10.home.rpmfusion.net -[buildppc] - -[buildppc64] - [buildvm] buildvm-01.online.rpmfusion.net buildvm-02.online.rpmfusion.net -buildvm-05.virt.rpmfusion.net -buildvm-06.virt.rpmfusion.net -[buildhw-x86] +[buildhw] buildvm-03.online.rpmfusion.net -buildvm-04.online.rpmfusion.net +buildvm-05.virt.rpmfusion.net +buildvm-06.virt.rpmfusion.net buildvm-07.virt.rpmfusion.net -buildvm-08.virt.rpmfusion.net +#buildvm-08.virt.rpmfusion.net -[buildvm-ppc64] +[buildhw_ppc64] buildppc-01.osuosl.rpmfusion.net ansible_user=fedora ansible_become=yes -#buildppc-02.osuosl.rpmfusion.net ansible_user=fedora ansible_become=yes -[buildvm-ppc64le] +[buildhw_ppc64le] buildppcle-01.osuosl.rpmfusion.net ansible_user=fedora ansible_become=yes buildppcle-02.osuosl.rpmfusion.net ansible_user=fedora ansible_become=yes -[buildvmhost] - -[buildhw:children] -buildvm-ppc64 -buildvm-ppc64le -buildaarch64 -buildarm -buildhw-x86 - -[buildarm:children] -home-arm -scaleway-c1 +[buildhw_armv7:children] +home_arm +scaleway_c1 [bkernel] + [linaro:children] -buildaarch64 +buildhw_aarch64 [osuosl:children] -buildvm-ppc64 -buildvm-ppc64le +buildhw_ppc64 +buildhw_ppc64le [home:children] -home-arm +home_arm -[scaleway-c1] +[scaleway_c1] arm-builder01.scaleway.rpmfusion.net arm-builder02.scaleway.rpmfusion.net arm-builder03.scaleway.rpmfusion.net arm-builder04.scaleway.rpmfusion.net -[home-arm] +[home_arm] arm-builder09.home.rpmfusion.net arm-builder10.home.rpmfusion.net arm-builder11.home.rpmfusion.net @@ -69,13 +55,15 @@ arm-builder12.home.rpmfusion.net arm-jetson-tk1.home.rpmfusion.net arm-jetson-tx1.home.rpmfusion.net + [builders:children] -buildaarch64 buildhw +buildhw_armv7 +buildhw_ppc64 +buildhw_ppc64le +buildhw_aarch64 buildvm -buildvm-ppc64 -buildvm-ppc64le -buildarm +buildvm_aarch64 [builders:vars] ansible_python_interpreter=/usr/bin/python3 diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index a5939cb..5272d61 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -3,7 +3,7 @@ # NOTE: most of these vars_path come from group_vars/buildhw or from hostvars - name: make koji builder(s) on raw hw - hosts: buildhw:buildppc:buildarm:buildaarch64:bkernel + hosts: builders remote_user: root gather_facts: True diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 67d1967..bde5554 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm-stg" - name: make koji builder(s) - hosts: buildvm:buildvm-stg:buildvm-ppc64:buildvm-ppc64le:buildppcle:buildppc:buildvm-s390 + hosts: buildvm:buildvm-stg:buildvm_aarch64 user: root gather_facts: True