diff --git a/inventory/group_vars/jenkins-master b/inventory/group_vars/jenkins-master index ae5ff8ebc0..da84eda558 100644 --- a/inventory/group_vars/jenkins-master +++ b/inventory/group_vars/jenkins-master @@ -13,10 +13,15 @@ slaves: description: Red Hat Enterprise Linux Server 7.1 labels: el EL el7 EL7 rhel RHEL rhel7 RHEL7 capacity: 4 -- name: F22 - host: jenkins-slave-f22.fedorainfracloud.org - description: Fedora 22 - labels: fedora Fedora fedora22 Fedora22 +- name: F23 + host: jenkins-slave-f23.fedorainfracloud.org + description: Fedora 23 + labels: fedora Fedora fedora23 Fedora23 + capacity: 4 +- name: F24 + host: jenkins-slave-f24.fedorainfracloud.org + description: Fedora 24 + labels: fedora Fedora fedora24 Fedora24 capacity: 4 # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/inventory/host_vars/jenkins-slave-f22.fedorainfracloud.org b/inventory/host_vars/jenkins-slave-f22.fedorainfracloud.org deleted file mode 100644 index fb68326eb4..0000000000 --- a/inventory/host_vars/jenkins-slave-f22.fedorainfracloud.org +++ /dev/null @@ -1,19 +0,0 @@ ---- -image: "{{ fedora22_x86_64 }}" -instance_type: m1.xlarge -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-persistent,all-icmp-persistent,default -zone: nova -tcp_ports: [22] - -inventory_tenant: persistent -inventory_instance_name: jenkins-slave-f22 -hostbase: jenkins-el6 -public_ip: 209.132.184.190 -root_auth_users: mizdebsk msrb -description: jenkins f22 builder in new cloud - -cloud_networks: - # persistent-net - - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" - diff --git a/inventory/inventory b/inventory/inventory index a3f1305770..9965b4368b 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1037,7 +1037,6 @@ jenkins.fedorainfracloud.org [jenkins-slave] jenkins-slave-el6.fedorainfracloud.org jenkins-slave-el7.fedorainfracloud.org -jenkins-slave-f22.fedorainfracloud.org jenkins-slave-f23.fedorainfracloud.org jenkins-slave-f24.fedorainfracloud.org