x/ansible-role-jenkins-job-builder
Code Issues Proposed changes

Switch to package module

Browse Source 
This will reduce the need to debian / redhat specific logic.

Change-Id: Ib0b0ee7e7d27981aacf496b5979da6e77eb2cb65
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-03-01 19:17:30 -05:00
parent a66fbaa7dd
commit d1c6b9f0c0
3 changed files with 13 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tasks/install.yaml
View File

@ -17,10 +17,19 @@
jenkins_job_builder_build_depends: "{{ __jenkins_job_builder_build_depends | list }}"
when: jenkins_job_builder_build_depends is not defined
- include: install/debian.yaml
when: ansible_os_family == 'Debian'
# NOTE(pabelanger): This needs to be here for now, since we need python-pip.
- name: Ensure EPEL is enabled.
package:
name: epel-release
state: installed
when: (jenkins_job_builder_install_method == 'git' or jenkins_job_builder_install_method == 'pip') and
ansible_os_family == 'RedHat'
- include: install/redhat.yaml
when: ansible_os_family == 'RedHat'
- name: Ensure build dependencies are installed.
package:
name: "{{ item }}"
state: installed
with_items: "{{ jenkins_job_builder_build_depends }}"
when: jenkins_job_builder_install_method == 'git' or jenkins_job_builder_install_method == 'pip'
- include: "install/{{ jenkins_job_builder_install_method }}.yaml"

20
tasks/install/debian.yaml
View File

@ -1,20 +0,0 @@
# Copyright 2015 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
---
- name: Ensure build dependencies are installed.
apt:
pkg: "{{ item }}"
state: installed
with_items: "{{ jenkins_job_builder_build_depends }}"
when: jenkins_job_builder_install_method == 'git' or jenkins_job_builder_install_method == 'pip'

27
tasks/install/redhat.yaml
View File

@ -1,27 +0,0 @@
# Copyright 2015 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
---
# NOTE(pabelanger): This needs to be here for now, since we need python-pip.
- name: Ensure EPEL is enabled.
yum:
pkg: epel-release
state: installed
when: jenkins_job_builder_install_method == 'git' or jenkins_job_builder_install_method == 'pip'
- name: Ensure build dependencies are installed.
yum:
pkg: "{{ item }}"
state: installed
with_items: "{{ jenkins_job_builder_build_depends }}"
when: jenkins_job_builder_install_method == 'git' or jenkins_job_builder_install_method == 'pip'