From 7c8cae4659c88cf852a5edd13a87ba9f31b4221e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 21 Apr 2016 20:31:22 +0000 Subject: [PATCH] Add jenkins f23 and f24 (alpha) slaves. --- .../jenkins-slave-f23.fedorainfracloud.org | 19 +++++++++++++++++++ .../jenkins-slave-f24.fedorainfracloud.org | 19 +++++++++++++++++++ inventory/inventory | 2 ++ .../fed-cloud09.cloud.fedoraproject.org.yml | 3 ++- vars/global.yml | 1 + 5 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 inventory/host_vars/jenkins-slave-f23.fedorainfracloud.org create mode 100644 inventory/host_vars/jenkins-slave-f24.fedorainfracloud.org diff --git a/inventory/host_vars/jenkins-slave-f23.fedorainfracloud.org b/inventory/host_vars/jenkins-slave-f23.fedorainfracloud.org new file mode 100644 index 0000000000..6ba406b9b9 --- /dev/null +++ b/inventory/host_vars/jenkins-slave-f23.fedorainfracloud.org @@ -0,0 +1,19 @@ +--- +image: "{{ fedora23_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-f23 +hostbase: jenkins-slave-f23 +public_ip: 209.132.184.47 +root_auth_users: mizdebsk msrb +description: jenkins f23 builder in new cloud + +cloud_networks: + # persistent-net + - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" + diff --git a/inventory/host_vars/jenkins-slave-f24.fedorainfracloud.org b/inventory/host_vars/jenkins-slave-f24.fedorainfracloud.org new file mode 100644 index 0000000000..7ace79e531 --- /dev/null +++ b/inventory/host_vars/jenkins-slave-f24.fedorainfracloud.org @@ -0,0 +1,19 @@ +--- +image: "{{ fedora24_alpha_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-f24 +hostbase: jenkins-slave-f24 +public_ip: 209.132.184.237 +root_auth_users: mizdebsk msrb +description: jenkins f24 builder in new cloud + +cloud_networks: + # persistent-net + - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" + diff --git a/inventory/inventory b/inventory/inventory index 35a6c2ca23..c5fec18acc 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1041,6 +1041,8 @@ jenkins.fedorainfracloud.org 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 [osuosl] proxy06.fedoraproject.org diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml index 337f6292cc..cd03b6c166 100644 --- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml @@ -641,7 +641,8 @@ copy_from: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1503.qcow2 - name: CentOS-6-x86_64-GenericCloud-20141129_01 copy_from: http://cloud.centos.org/centos/6/images/CentOS-6-x86_64-GenericCloud-20141129_01.qcow2 - + - name: Fedora-Cloud-Base-24_Alpha-7.x86_64.qcow2 + copy_from: http://dl.fedoraproject.org/pub/fedora/linux/releases/test/24_Alpha/CloudImages/x86_64/images/Fedora-Cloud-Base-24_Alpha-7.x86_64.qcow2 # RHEL6 can be downloaded from https://rhn.redhat.com/rhn/software/channel/downloads/Download.do?cid=16952 - stat: path=/root/images/rhel-guest-image-6.6-20141222.0.x86_64.qcow2 register: rhel6_image diff --git a/vars/global.yml b/vars/global.yml index 0510713006..d62055463c 100644 --- a/vars/global.yml +++ b/vars/global.yml @@ -39,6 +39,7 @@ fedora_atomic_22_alpha: Fedora-Cloud-Atomic-22_Alpha-20150305.x86_64 fedora_atomic_22_beta: Fedora-Cloud-Atomic-22_Beta-20150415.x86_64 fedora_atomic_22: Fedora-Cloud-Atomic-22-20150521.x86_64 fedora23_x86_64: Fedora-Cloud-Base-23-20151030.x86_64 +fedora24_alpha_x86_64: Fedora-Cloud-Base-24_Alpha-7.x86_64.qcow2 centos70_x86_64: CentOS-7-x86_64-GenericCloud-1503 centos66_x86_64: CentOS-6-x86_64-GenericCloud-20141129_01 rhel70_x86_64: rhel-guest-image-7.0-20140930.0.x86_64