From fc15d2e047d879f635dc86daa0c14f69bddc9a8a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 27 Sep 2017 20:50:46 +0000 Subject: [PATCH] add f26 twisted bot cloud instances --- ...-02-host-for-modular-server-composes.patch | 77 +++++++++++++++++++ ...> twisted-fedora26-1.fedorainfracloud.org} | 8 +- ...> twisted-fedora26-2.fedorainfracloud.org} | 8 +- inventory/inventory | 2 + 4 files changed, 87 insertions(+), 8 deletions(-) create mode 100644 0001-add-compose-x86-02-host-for-modular-server-composes.patch rename inventory/host_vars/{twisted-fedora23-1.fedorainfracloud.org => twisted-fedora26-1.fedorainfracloud.org} (67%) rename inventory/host_vars/{twisted-fedora23-2.fedorainfracloud.org => twisted-fedora26-2.fedorainfracloud.org} (67%) diff --git a/0001-add-compose-x86-02-host-for-modular-server-composes.patch b/0001-add-compose-x86-02-host-for-modular-server-composes.patch new file mode 100644 index 0000000000..c185a75142 --- /dev/null +++ b/0001-add-compose-x86-02-host-for-modular-server-composes.patch @@ -0,0 +1,77 @@ +From 52657c6540da0c120ed6a3723ea6b76d1431106d Mon Sep 17 00:00:00 2001 +From: Kevin Fenzi +Date: Fri, 22 Sep 2017 21:10:06 +0000 +Subject: [PATCH] add compose-x86-02 host for modular server composes + +Signed-off-by: Kevin Fenzi +--- + .../compose-x86-02.phx2.fedoraproject.org | 44 ++++++++++++++++++++++ + inventory/inventory | 1 + + 2 files changed, 45 insertions(+) + create mode 100644 inventory/host_vars/compose-x86-02.phx2.fedoraproject.org + +diff --git a/inventory/host_vars/compose-x86-02.phx2.fedoraproject.org b/inventory/host_vars/compose-x86-02.phx2.fedoraproject.org +new file mode 100644 +index 0000000..7ca9fe1 +--- /dev/null ++++ b/inventory/host_vars/compose-x86-02.phx2.fedoraproject.org +@@ -0,0 +1,44 @@ ++nm: 255.255.255.0 ++gw: 10.5.125.254 ++dns: 10.5.126.21 ++ ++# ++# These are 64bit ++# ++libdir: /usr/lib64 ++ ++ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-26 ++ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ ++virt_install_command: "{{ virt_install_command_two_nic }}" ++ ++lvm_size: 30000 ++mem_size: 8192 ++num_cpus: 8 ++ ++volgroup: /dev/xenGuests ++eth0_ip: 10.5.125.42 ++eth1_ip: 10.5.127.27 ++eth1_gw: 10.5.127.254 ++vmhost: bvirthost05.phx2.fedoraproject.org ++datacenter: phx2 ++ ++fas_client_groups: sysadmin-releng ++ ++koji_hub_nfs: "fedora_koji" ++ ++kojipkgs_url: kojipkgs.fedoraproject.org ++kojihub_url: koji.fedoraproject.org/kojihub ++kojihub_scheme: https ++ ++fedmsg_certs: ++- service: releng ++ owner: root ++ group: sysadmin-releng ++ can_send: ++ # new school pungi-koji stuff (ask dgilmore) ++ - pungi.compose.phase.start ++ - pungi.compose.phase.stop ++ - pungi.compose.status.change ++ - pungi.compose.createiso.targets ++ - pungi.compose.createiso.imagefail ++ - pungi.compose.createiso.imagedone +diff --git a/inventory/inventory b/inventory/inventory +index 3021edf..606d47e 100644 +--- a/inventory/inventory ++++ b/inventory/inventory +@@ -25,6 +25,7 @@ arm03-qa01.cloud.fedoraproject.org + + [releng-compose] + compose-x86-01.phx2.fedoraproject.org ++compose-x86-02.phx2.fedoraproject.org + branched-composer.phx2.fedoraproject.org + rawhide-composer.phx2.fedoraproject.org + +-- +1.8.3.1 + diff --git a/inventory/host_vars/twisted-fedora23-1.fedorainfracloud.org b/inventory/host_vars/twisted-fedora26-1.fedorainfracloud.org similarity index 67% rename from inventory/host_vars/twisted-fedora23-1.fedorainfracloud.org rename to inventory/host_vars/twisted-fedora26-1.fedorainfracloud.org index c55b7eb855..bf494caca8 100644 --- a/inventory/host_vars/twisted-fedora23-1.fedorainfracloud.org +++ b/inventory/host_vars/twisted-fedora26-1.fedorainfracloud.org @@ -1,5 +1,5 @@ --- -image: "{{ fedora23_x86_64 }}" +image: "{{ fedora26_x86_64 }}" instance_type: m1.medium keypair: fedora-admin-20130801 security_group: ssh-anywhere-pythonbots,all-icmp-pythonbots,default @@ -7,10 +7,10 @@ zone: nova tcp_ports: [22, 80, 443] inventory_tenant: pythonbots -inventory_instance_name: twisted-fedora23-1 -hostbase: twisted-fedora23-1 +inventory_instance_name: twisted-fedora26-1 +hostbase: twisted-fedora26-1 public_ip: 209.132.184.185 -description: twisted buildbot for fedora 23 +description: twisted buildbot for fedora 26 cloud_networks: # pythonbots-net diff --git a/inventory/host_vars/twisted-fedora23-2.fedorainfracloud.org b/inventory/host_vars/twisted-fedora26-2.fedorainfracloud.org similarity index 67% rename from inventory/host_vars/twisted-fedora23-2.fedorainfracloud.org rename to inventory/host_vars/twisted-fedora26-2.fedorainfracloud.org index b01377d6b2..02fe970255 100644 --- a/inventory/host_vars/twisted-fedora23-2.fedorainfracloud.org +++ b/inventory/host_vars/twisted-fedora26-2.fedorainfracloud.org @@ -1,5 +1,5 @@ --- -image: "{{ fedora23_x86_64 }}" +image: "{{ fedora26_x86_64 }}" instance_type: m1.medium keypair: fedora-admin-20130801 security_group: ssh-anywhere-pythonbots,all-icmp-pythonbots,default @@ -7,10 +7,10 @@ zone: nova tcp_ports: [22, 80, 443] inventory_tenant: pythonbots -inventory_instance_name: twisted-fedora23-2 -hostbase: twisted-fedora23-2 +inventory_instance_name: twisted-fedora26-2 +hostbase: twisted-fedora26-2 public_ip: 209.132.184.186 -description: twisted buildbot for fedora23 2 +description: twisted buildbot for fedora 26 cloud_networks: # pythonbots-net diff --git a/inventory/inventory b/inventory/inventory index 606d47ec25..edc5fe5e29 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1341,6 +1341,8 @@ twisted-fedora24-1.fedorainfracloud.org twisted-fedora24-2.fedorainfracloud.org twisted-fedora25-1.fedorainfracloud.org twisted-fedora25-2.fedorainfracloud.org +twisted-fedora26-1.fedorainfracloud.org +twisted-fedora26-2.fedorainfracloud.org twisted-rhel7-1.fedorainfracloud.org twisted-rhel7-2.fedorainfracloud.org