diff --git a/inventory/group_vars/jenkins-master b/inventory/group_vars/jenkins-master new file mode 100644 index 0000000000..4ef7eabc4c --- /dev/null +++ b/inventory/group_vars/jenkins-master @@ -0,0 +1,17 @@ +--- +datacenter: fedorainfracloud +freezes: false + +slaves: +- name: EL6 + host: jenkins-slave-el6.fedorainfracloud.org + description: CentOS 6.6 + labels: el EL el6 EL6 centos CentOS centos6 CentOS6 +- name: EL7 + host: jenkins-slave-el7.fedorainfracloud.org + description: Red Hat Enterprise Linux Server 7.1 + labels: el EL el7 EL7 rhel RHEL rhel7 RHEL7 +- name: F22 + host: jenkins-slave-f22.fedorainfracloud.org + description: Fedora 22 + labels: fedora Fedora fedora22 Fedora22 diff --git a/inventory/group_vars/jenkins-dev b/inventory/group_vars/jenkins-slave similarity index 90% rename from inventory/group_vars/jenkins-dev rename to inventory/group_vars/jenkins-slave index 33b559b1b3..4e6c0bca08 100644 --- a/inventory/group_vars/jenkins-dev +++ b/inventory/group_vars/jenkins-slave @@ -2,20 +2,6 @@ datacenter: fedorainfracloud freezes: false -slaves: -- name: EL6 - host: jenkins-slave-el6.fedorainfracloud.org - description: CentOS 6.6 - labels: el EL el6 EL6 centos CentOS centos6 CentOS6 -- name: EL7 - host: jenkins-slave-el7.fedorainfracloud.org - description: Red Hat Enterprise Linux Server 7.1 - labels: el EL el7 EL7 rhel RHEL rhel7 RHEL7 -- name: F22 - host: jenkins-slave-f22.fedorainfracloud.org - description: Fedora 22 - labels: fedora Fedora fedora22 Fedora22 - # Packages installed on all Jenkins slaves (Fedora, CentOS) slave_packages_common: - java-1.8.0-openjdk-devel