diff --git a/inventory/builders b/inventory/builders index 6c39658230..9d884183ce 100644 --- a/inventory/builders +++ b/inventory/builders @@ -219,28 +219,6 @@ buildvm-ppc64le-11.ppc.fedoraproject.org buildvm-ppc64le-12.ppc.fedoraproject.org buildvm-ppc64le-13.ppc.fedoraproject.org -# -# These are secondary arch builders. -# -[buildppc] -buildppc-01.ppc.fedoraproject.org -buildppc-02.ppc.fedoraproject.org -buildppc-03.ppc.fedoraproject.org -buildppc-04.ppc.fedoraproject.org - -# -# These are secondary arch builders. -# -[buildppcle] -buildppcle-01.ppc.fedoraproject.org -buildppcle-02.ppc.fedoraproject.org -buildppcle-03.ppc.fedoraproject.org -buildppcle-04.ppc.fedoraproject.org - -[buildaarch64] -aarch64-02a.arm.fedoraproject.org -aarch64-06a.arm.fedoraproject.org - [bkernel] bkernel01.phx2.fedoraproject.org bkernel02.phx2.fedoraproject.org @@ -304,9 +282,6 @@ buildvm-aarch64 buildvm-armv7 buildvm-ppc64 buildvm-ppc64le -buildppc -buildppcle -buildaarch64 buildvm-s390 buildvm-s390x bkernel diff --git a/inventory/host_vars/compose-ppc64-01.ppc.fedoraproject.org b/inventory/host_vars/compose-ppc64-01.ppc.fedoraproject.org deleted file mode 100644 index 01103f583f..0000000000 --- a/inventory/host_vars/compose-ppc64-01.ppc.fedoraproject.org +++ /dev/null @@ -1,22 +0,0 @@ ---- -volgroup: /dev/vg_guests -ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-25-ppc64 -ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/25/Everything/ppc64/os/ -virt_install_command: "{{ virt_install_command_one_nic }} --graphics none" - -vmhost: ppc8-04.ppc.fedoraproject.org -eth0_ip: 10.5.129.14 -gw: 10.5.129.254 -main_bridge: br1 - -koji_hub_nfs: "fedora_ppc/data" - -kojipkgs_url: ppcpkgs.fedoraproject.org -kojihub_url: ppc.koji.fedoraproject.org/kojihub -kojihub_scheme: https - -koji_server_url: "https://ppc.koji.fedoraproject.org/kojihub" -koji_weburl: "https://ppc.koji.fedoraproject.org/koji" -koji_topurl: "https://ppcpkgs.fedoraproject.org/" - -sudoers: "{{ private }}/files/sudo/sysadmin-secondary-sudoers" diff --git a/inventory/host_vars/compose-ppc64le-01.ppc.fedoraproject.org b/inventory/host_vars/compose-ppc64le-01.ppc.fedoraproject.org deleted file mode 100644 index 2388b613ce..0000000000 --- a/inventory/host_vars/compose-ppc64le-01.ppc.fedoraproject.org +++ /dev/null @@ -1,22 +0,0 @@ ---- -volgroup: /dev/vg_guests -ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-24-ppc64le -ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/24/Everything/ppc64le/os/ -virt_install_command: "{{ virt_install_command_one_nic }} --graphics none" - -vmhost: ppc8-03.ppc.fedoraproject.org -eth0_ip: 10.5.129.15 -gw: 10.5.129.254 -main_bridge: br1 - -koji_hub_nfs: "fedora_arm/data" - -kojipkgs_url: armpkgs.fedoraproject.org -kojihub_url: arm.koji.fedoraproject.org/kojihub -kojihub_scheme: https - -koji_server_url: "https://arm.koji.fedoraproject.org/kojihub" -koji_weburl: "https://arm.koji.fedoraproject.org/koji" -koji_topurl: "https://armpkgs.fedoraproject.org/" - -sudoers: "{{ private }}/files/sudo/sysadmin-secondary-sudoers" diff --git a/inventory/inventory b/inventory/inventory index e9bf519390..3d0b532ac3 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -27,8 +27,6 @@ branched-composer.phx2.fedoraproject.org rawhide-composer.phx2.fedoraproject.org [releng-secondary] -compose-ppc64-01.ppc.fedoraproject.org -compose-ppc64le-01.ppc.fedoraproject.org compose-s390-01.s390.fedoraproject.org [releng-stg] diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index a1f0a65b60..79dd008d81 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -3,10 +3,10 @@ # NOTE: make sure there is room/space for this builder on the buildvmhost # NOTE: most of these vars_path come from group_vars/buildvm or from hostvars -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm-stg:buildvm-aarch64:buildvm-armv7:buildvm-ppc64:buildvm-ppc64le:buildppcle:buildppc:buildvm-s390:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm-stg:buildvm-aarch64:buildvm-armv7:buildvm-ppc64:buildvm-ppc64le:buildvm-s390:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg" - name: make koji builder(s) - hosts: buildvm:buildvm-stg:buildvm-aarch64:buildvm-armv7:buildvm-ppc64:buildvm-ppc64le:buildppcle:buildppc:buildvm-s390:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg:buildvm-s390x + hosts: buildvm:buildvm-stg:buildvm-aarch64:buildvm-armv7:buildvm-ppc64:buildvm-ppc64le:buildvm-s390:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg:buildvm-s390x user: root gather_facts: True diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 729b184f2f..3f485c33d1 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this instance on the buildvmhost # NOTE: most of these vars_path come from group_vars/releng or from hostvars -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=releng-compose:releng-stg:compose-ppc64-01.ppc.fedoraproject.org:compose-ppc64le-01.ppc.fedoraproject.org:compose-s390-01.s390.fedoraproject.org" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=releng-compose:releng-stg:compose-s390-01.s390.fedoraproject.org" - name: Setup releng compose hosts hosts: releng-compose:releng-secondary:releng-stg diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml index b9a07da060..11cca720da 100644 --- a/roles/koji_builder/tasks/main.yml +++ b/roles/koji_builder/tasks/main.yml @@ -179,7 +179,7 @@ # oz.cfg upstream ram and cpu definitions are not enough - name: oz.cfg copy: src=oz.cfg dest=/etc/oz/oz.cfg - when: not inventory_hostname.startswith(('buildppc','buildvm-s390x')) + when: not inventory_hostname.startswith('buildvm-s390x') tags: - koji_builder