Drop ppc64: Since fedora 28 is end of life and we dropped it for epel6/7, drop ppc64 from all the things.
Remove ppc64-test instance in cloud. Remove template conditionals that no longer apply since ppc64 is gone. Remove buildvm-ppc64 instances. Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi
parent
2183741852
commit
168644af88
22 changed files with 2 additions and 231 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
vmhost: ppc8-01.ppc.fedoraproject.org
|
||||
eth0_ip: 10.5.129.87
|
||||
eth1_ip: 10.5.127.12
|
||||
|
|
@ -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"
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
vmhost: ppc8-01.ppc.fedoraproject.org
|
||||
eth0_ip: 10.5.129.88
|
||||
eth1_ip: 10.5.127.10
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
vmhost: ppc8-01.ppc.fedoraproject.org
|
||||
eth0_ip: 10.5.129.89
|
||||
eth1_ip: 10.5.127.115
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
vmhost: ppc8-01.ppc.fedoraproject.org
|
||||
eth0_ip: 10.5.129.90
|
||||
eth1_ip: 10.5.127.116
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
vmhost: ppc8-01.ppc.fedoraproject.org
|
||||
eth0_ip: 10.5.129.91
|
||||
eth1_ip: 10.5.127.117
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
vmhost: ppc8-02.ppc.fedoraproject.org
|
||||
eth0_ip: 10.5.129.92
|
||||
eth1_ip: 10.5.127.139
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
vmhost: ppc8-02.ppc.fedoraproject.org
|
||||
eth0_ip: 10.5.129.93
|
||||
eth1_ip: 10.5.127.140
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
vmhost: ppc8-02.ppc.fedoraproject.org
|
||||
eth0_ip: 10.5.129.94
|
||||
eth1_ip: 10.5.127.141
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
vmhost: ppc8-02.ppc.fedoraproject.org
|
||||
eth0_ip: 10.5.129.95
|
||||
eth1_ip: 10.5.127.142
|
||||
|
|
@ -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"
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -7,9 +7,6 @@
|
|||
<arch>armhfp</arch>
|
||||
<arch>i386</arch>
|
||||
<arch>ppc64le</arch>
|
||||
[% if release.version_int == 28 %]
|
||||
<arch>ppc64</arch>
|
||||
[% endif %]
|
||||
<arch>s390x</arch>
|
||||
<arch>x86_64</arch>
|
||||
</arches>
|
||||
|
|
|
|||
|
|
@ -7,19 +7,12 @@
|
|||
[% if release.version_int >= 25 or release.version_int == 6 %]
|
||||
<arch>i386</arch>
|
||||
[% endif %]
|
||||
[% if release.version_int >= 25 %]
|
||||
<arch>armhfp</arch>
|
||||
[% endif %]
|
||||
[% if release.version_int == 28 %]
|
||||
<arch>ppc64</arch>
|
||||
[% endif %]
|
||||
[% if release.version_int >= 26 or release.version_int == 7 %]
|
||||
<arch>aarch64</arch>
|
||||
<arch>ppc64le</arch>
|
||||
[% endif %]
|
||||
[% if release.version_int >= 27 %]
|
||||
<arch>s390x</arch>
|
||||
[% endif %]
|
||||
</arches>
|
||||
</variant>
|
||||
<variant id="AtomicHost" name="AtomicHost" type="variant" is_empty="true">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue