diff --git a/inventory/builders b/inventory/builders index 93ad7a03cd..ec63597a49 100644 --- a/inventory/builders +++ b/inventory/builders @@ -39,12 +39,6 @@ buildvm-03.stg.phx2.fedoraproject.org buildvm-04.stg.phx2.fedoraproject.org buildvm-05.stg.phx2.fedoraproject.org -[buildvm_ppc64_stg] -buildvm-ppc64-01.stg.ppc.fedoraproject.org - -[buildvm_ppc64le_stg] -buildvm-ppc64le-01.stg.ppc.fedoraproject.org - [buildvm_aarch64_stg] buildvm-aarch64-01.stg.arm.fedoraproject.org @@ -187,20 +181,6 @@ buildhw-aarch64-08.arm.fedoraproject.org # Machine unresponsive, likely dead #buildhw-aarch64-09.arm.fedoraproject.org -# -# These are primary koji builders. -# -[buildvm_ppc64] -buildvm-ppc64-01.ppc.fedoraproject.org -buildvm-ppc64-02.ppc.fedoraproject.org -buildvm-ppc64-03.ppc.fedoraproject.org -buildvm-ppc64-04.ppc.fedoraproject.org -buildvm-ppc64-05.ppc.fedoraproject.org -buildvm-ppc64-06.ppc.fedoraproject.org -buildvm-ppc64-07.ppc.fedoraproject.org -buildvm-ppc64-08.ppc.fedoraproject.org -buildvm-ppc64-09.ppc.fedoraproject.org - # # These are primary koji builders. # @@ -286,9 +266,6 @@ buildvm-armv7-01.stg.arm.fedoraproject.org buildvm-armv7-01.arm.fedoraproject.org buildvm-armv7-02.arm.fedoraproject.org buildvm-armv7-03.arm.fedoraproject.org -buildvm-ppc64-01.stg.ppc.fedoraproject.org -buildvm-ppc64-01.ppc.fedoraproject.org -buildvm-ppc64-02.ppc.fedoraproject.org buildvm-ppc64le-01.stg.ppc.fedoraproject.org buildvm-ppc64le-01.ppc.fedoraproject.org buildvm-ppc64le-02.ppc.fedoraproject.org @@ -300,14 +277,12 @@ buildhw buildvm buildvm_aarch64 buildvm_armv7 -buildvm_ppc64 buildvm_ppc64le buildvm_s390x bkernel [builders_stg:children] buildvm_stg -buildvm_ppc64_stg buildvm_ppc64le_stg buildvm_aarch64_stg buildvm_armv7_stg diff --git a/inventory/cloud b/inventory/cloud index a646ab9c91..b7e661c43e 100644 --- a/inventory/cloud +++ b/inventory/cloud @@ -77,7 +77,6 @@ libravatar.fedorainfracloud.org libravatar-stg.fedorainfracloud.org magazine2.fedorainfracloud.org ppc64le-test.fedorainfracloud.org -ppc64-test.fedorainfracloud.org rawhide-test.fedorainfracloud.org regcfp2.fedorainfracloud.org respins.fedorainfracloud.org diff --git a/inventory/group_vars/buildppc b/inventory/group_vars/buildppc deleted file mode 100644 index 53dfc80057..0000000000 --- a/inventory/group_vars/buildppc +++ /dev/null @@ -1,34 +0,0 @@ ---- -# common items for the buildvm-* koji builders -volgroup: /dev/vg_guests -lvm_size: 150000 -mem_size: 10240 -max_mem_size: "{{ mem_size }}" -num_cpus: 4 -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/ -nm: 255.255.255.0 -gw: 10.5.129.254 -dns: 10.5.126.21 -main_bridge: br1 -virt_install_command: "{{ virt_install_command_one_nic }} --graphics none" - -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file -host_group: kojibuilder -fas_client_groups: sysadmin-releng,sysadmin-secondary -sudoers: "{{ private }}/files/sudo/sysadmin-secondary-sudoers" - -koji_hub_nfs: "fedora_ppc/data" -koji_server_url: "https://ppc.koji.fedoraproject.org/kojihub" -koji_weburl: "https://ppc.koji.fedoraproject.org/koji" -koji_topurl: "https://ppcpkgs.fedoraproject.org/" - -csi_security_category: High -csi_primary_contact: Fedora Admins - admin@fedoraproject.org -csi_purpose: Koji service employs a set of machines to build packages for the Fedora project. This playbook builds vm builders. -csi_relationship: | - * VMs built on top of buildvmhost - * Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios - * Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver. - * Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new diff --git a/inventory/group_vars/buildvm_ppc64 b/inventory/group_vars/buildvm_ppc64 deleted file mode 100644 index 2ccad02897..0000000000 --- a/inventory/group_vars/buildvm_ppc64 +++ /dev/null @@ -1,43 +0,0 @@ ---- -# common items for the buildvm-* koji builders -volgroup: /dev/vg_guests -lvm_size: 145000 -mem_size: 10240 -max_mem_size: "{{ mem_size }}" -num_cpus: 4 -ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-28-ppc64 -ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/28/Server/ppc64/os/ -nm: 255.255.255.0 -gw: 10.5.129.254 -dns: 10.5.126.21 - -# -# The ppc virthosts have different bridge names for the main and nfs bridges. -# -main_bridge: br1 -nfs_bridge: br3 -virt_install_command: "{{ virt_install_command_two_nic }} --graphics none" - -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file -host_group: kojibuilder -fas_client_groups: sysadmin-releng -sudoers: "{{ private }}/files/sudo/00releng-sudoers" - -koji_hub_nfs: "fedora_koji" -koji_server_url: "https://koji.fedoraproject.org/kojihub" -koji_weburl: "https://koji.fedoraproject.org/koji" -koji_topurl: "https://kojipkgs.fedoraproject.org/" - -# These variables are pushed into /etc/system_identification by the base role. -# Groups and individual hosts should ovveride them with specific info. -# See http://infrastructure.fedoraproject.org/csi/security-policy/ - -csi_security_category: High -csi_primary_contact: Fedora Admins - admin@fedoraproject.org -csi_purpose: Koji service employs a set of virtual machines to build packages for the Fedora project. This group builds packages for ppcle architecture. -csi_relationship: | - * Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios - * Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver. - * Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new - * virtual instances diff --git a/inventory/group_vars/buildvm_ppc64_stg b/inventory/group_vars/buildvm_ppc64_stg deleted file mode 100644 index 82066a861b..0000000000 --- a/inventory/group_vars/buildvm_ppc64_stg +++ /dev/null @@ -1,50 +0,0 @@ ---- -# common items for the buildvm-* koji builders -volgroup: /dev/vg_guests -lvm_size: 150000 -mem_size: 10240 -max_mem_size: "{{ mem_size }}" -num_cpus: 4 -ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-30-ppc64 -ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/30/Server/ppc64/os/ -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 - -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file -host_group: kojibuilder -fas_client_groups: sysadmin-releng -sudoers: "{{ private }}/files/sudo/00releng-sudoers" -datacenter: staging -nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3" -ansible_python_interpreter: "/usr/bin/python3" - -koji_hub_nfs: "fedora_koji" -koji_server_url: "https://koji.stg.fedoraproject.org/kojihub" -koji_weburl: "https://koji.stg.fedoraproject.org/koji" -koji_topurl: "https://kojipkgs.stg.fedoraproject.org/" -# These variables are pushed into /etc/system_identification by the base role. -# Groups and individual hosts should ovveride them with specific info. -# See http://infrastructure.fedoraproject.org/csi/security-policy/ - -csi_security_category: High -csi_primary_contact: Fedora Admins - admin@fedoraproject.org -csi_purpose: Koji service employs a set of machines to build packages for the Fedora project. This playbook builds vm builders (staging). -csi_relationship: | - * VMs built on top of buildvmhost - * Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios - * Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver. - * Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new - -# this is to enable nested virt, which we need for some builds -virt_install_command: "{{ virt_install_command_one_nic }} --cpu=host-passthrough,+vmx" - -# These variables are for koji-containerbuild/osbs -osbs_url: "osbs.stg.fedoraproject.org" -source_registry: "registry.stg.fedoraproject.org" -docker_registry: "candidate-registry.stg.fedoraproject.org" -koji_root: "koji.stg.fedoraproject.org/koji" -koji_hub: "koji.stg.fedoraproject.org/kojihub" - -createrepo: True diff --git a/inventory/host_vars/buildvm-ppc64-01.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-01.ppc.fedoraproject.org deleted file mode 100644 index 55fcc01aac..0000000000 --- a/inventory/host_vars/buildvm-ppc64-01.ppc.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: ppc8-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.87 -eth1_ip: 10.5.127.12 diff --git a/inventory/host_vars/buildvm-ppc64-01.stg.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-01.stg.ppc.fedoraproject.org deleted file mode 100644 index eb390996c3..0000000000 --- a/inventory/host_vars/buildvm-ppc64-01.stg.ppc.fedoraproject.org +++ /dev/null @@ -1,6 +0,0 @@ ---- -vmhost: ppc8-04.ppc.fedoraproject.org -eth0_ip: 10.5.129.230 -gw: 10.5.129.254 -main_bridge: br1 -virt_install_command: "{{ virt_install_command_one_nic }} --graphics none" diff --git a/inventory/host_vars/buildvm-ppc64-02.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-02.ppc.fedoraproject.org deleted file mode 100644 index 012e0ba5ce..0000000000 --- a/inventory/host_vars/buildvm-ppc64-02.ppc.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: ppc8-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.88 -eth1_ip: 10.5.127.10 diff --git a/inventory/host_vars/buildvm-ppc64-03.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-03.ppc.fedoraproject.org deleted file mode 100644 index 5a53387eb1..0000000000 --- a/inventory/host_vars/buildvm-ppc64-03.ppc.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: ppc8-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.89 -eth1_ip: 10.5.127.115 diff --git a/inventory/host_vars/buildvm-ppc64-04.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-04.ppc.fedoraproject.org deleted file mode 100644 index 025227696d..0000000000 --- a/inventory/host_vars/buildvm-ppc64-04.ppc.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: ppc8-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.90 -eth1_ip: 10.5.127.116 diff --git a/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org deleted file mode 100644 index 894fcd8524..0000000000 --- a/inventory/host_vars/buildvm-ppc64-05.ppc.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: ppc8-01.ppc.fedoraproject.org -eth0_ip: 10.5.129.91 -eth1_ip: 10.5.127.117 diff --git a/inventory/host_vars/buildvm-ppc64-06.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-06.ppc.fedoraproject.org deleted file mode 100644 index 7931584022..0000000000 --- a/inventory/host_vars/buildvm-ppc64-06.ppc.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: ppc8-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.92 -eth1_ip: 10.5.127.139 diff --git a/inventory/host_vars/buildvm-ppc64-07.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-07.ppc.fedoraproject.org deleted file mode 100644 index 94443b2e83..0000000000 --- a/inventory/host_vars/buildvm-ppc64-07.ppc.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: ppc8-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.93 -eth1_ip: 10.5.127.140 diff --git a/inventory/host_vars/buildvm-ppc64-08.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-08.ppc.fedoraproject.org deleted file mode 100644 index 8a1c52f93f..0000000000 --- a/inventory/host_vars/buildvm-ppc64-08.ppc.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: ppc8-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.94 -eth1_ip: 10.5.127.141 diff --git a/inventory/host_vars/buildvm-ppc64-09.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-09.ppc.fedoraproject.org deleted file mode 100644 index 6e1529de28..0000000000 --- a/inventory/host_vars/buildvm-ppc64-09.ppc.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -vmhost: ppc8-02.ppc.fedoraproject.org -eth0_ip: 10.5.129.95 -eth1_ip: 10.5.127.142 diff --git a/inventory/host_vars/ppc64-test.fedorainfracloud.org b/inventory/host_vars/ppc64-test.fedorainfracloud.org deleted file mode 100644 index f3aec01ef0..0000000000 --- a/inventory/host_vars/ppc64-test.fedorainfracloud.org +++ /dev/null @@ -1,17 +0,0 @@ ---- -image: Fedora-Cloud-Base-28-1.1.ppc64 -instance_type: ms1.medium -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-maintainertest,web-80-anywhere-maintainertest,default,web-443-anywhere-maintainertest,all-icmp-maintainertest -zone: nova -tcp_ports: [22] - -inventory_tenant: maintainertest -inventory_instance_name: ppc64-test -hostbase: ppc64-test -public_ip: 209.132.184.214 -description: ppc64-test instance - -cloud_networks: - # maintainertest-net - - net-id: "a512d096-3fa2-49cc-b989-d43ca687f91d" diff --git a/inventory/inventory b/inventory/inventory index f4f4cce6ad..2f6afddad7 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -723,7 +723,6 @@ buildvm-04.stg.phx2.fedoraproject.org buildvm-05.stg.phx2.fedoraproject.org buildvm-aarch64-01.stg.arm.fedoraproject.org buildvm-armv7-01.stg.arm.fedoraproject.org -buildvm-ppc64-01.stg.ppc.fedoraproject.org buildvm-ppc64le-01.stg.ppc.fedoraproject.org buildvm-s390x-01.stg.s390.fedoraproject.org busgateway01.stg.phx2.fedoraproject.org @@ -1144,7 +1143,6 @@ f28-test.fedorainfracloud.org f29-test.fedorainfracloud.org f30-test.fedorainfracloud.org rawhide-test.fedorainfracloud.org -ppc64-test.fedorainfracloud.org ppc64le-test.fedorainfracloud.org el6-test.fedorainfracloud.org el7-test.fedorainfracloud.org diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index c2846d73ae..9313e618fc 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: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_ppc64le: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:buildvm_ppc64_stg:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_armv7_stg:buildvm_s390x:buildvm_s390x_stg + hosts: buildvm:buildvm_stg:buildvm_aarch64:buildvm_armv7:buildvm_ppc64le:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_armv7_stg:buildvm_s390x:buildvm_s390x_stg user: root gather_facts: True diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 0570aa6e71..b9ffc14e3e 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -105,14 +105,12 @@ - name: install skopeo for container management package: name: skopeo - when: ansible_architecture != "ppc64" tags: - containerrebuild - name: install docker for container management package: name: docker - when: ansible_architecture != "ppc64" tags: - containerrebuild @@ -127,7 +125,6 @@ name: - ansible - python2-dockerfile-parse - when: ansible_architecture != "ppc64" tags: - containerrebuild diff --git a/playbooks/manual/staging-sync/koji.yml b/playbooks/manual/staging-sync/koji.yml index 972bfcf765..d0c1592b20 100644 --- a/playbooks/manual/staging-sync/koji.yml +++ b/playbooks/manual/staging-sync/koji.yml @@ -44,8 +44,6 @@ arches: aarch64 - name: buildvm-armv7-stg arches: armhfp - - name: buildvm-ppc64-stg - arches: ppc64 - name: buildvm-ppc64le-stg arches: ppc64le - name: buildvm-s390x-stg diff --git a/roles/bodhi2/backend/templates/variants.module.xml.j2 b/roles/bodhi2/backend/templates/variants.module.xml.j2 index 4f3d35e661..1044a12725 100644 --- a/roles/bodhi2/backend/templates/variants.module.xml.j2 +++ b/roles/bodhi2/backend/templates/variants.module.xml.j2 @@ -7,9 +7,6 @@ armhfp i386 ppc64le -[% if release.version_int == 28 %] - ppc64 -[% endif %] s390x x86_64 diff --git a/roles/bodhi2/backend/templates/variants.rpm.xml.j2 b/roles/bodhi2/backend/templates/variants.rpm.xml.j2 index f29e36b0f3..8d4554444e 100644 --- a/roles/bodhi2/backend/templates/variants.rpm.xml.j2 +++ b/roles/bodhi2/backend/templates/variants.rpm.xml.j2 @@ -7,19 +7,12 @@ [% if release.version_int >= 25 or release.version_int == 6 %] i386 [% endif %] - [% if release.version_int >= 25 %] armhfp - [% endif %] - [% if release.version_int == 28 %] - ppc64 - [% endif %] [% if release.version_int >= 26 or release.version_int == 7 %] aarch64 ppc64le [% endif %] - [% if release.version_int >= 27 %] s390x - [% endif %]