summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Branquinho <hugobranq@gmail.com>2016-11-30 12:31:40 +0000
committerHugo Branquinho <hugobranq@gmail.com>2016-11-30 12:31:40 +0000
commit1f2f1d91a5b95fc046c74c078b3e129e2765714a (patch)
treeed380f3744b17c4ac52ef23663508f9d44e17a41
parent682043b2f7a61fc6c74fb031d39fc26f97ea14f0 (diff)
Allow pip executableHEADmaster
Notes
Notes (review): Code-Review+2: Paul Belanger <pabelanger@redhat.com> Workflow+1: Paul Belanger <pabelanger@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 06 Jun 2017 01:05:43 +0000 Reviewed-on: https://review.openstack.org/406054 Project: openstack/ansible-role-jenkins-job-builder Branch: refs/heads/master
-rw-r--r--defaults/main.yaml1
-rw-r--r--tasks/install/git.yaml1
-rw-r--r--tasks/install/pip.yaml1
3 files changed, 3 insertions, 0 deletions
diff --git a/defaults/main.yaml b/defaults/main.yaml
index b182b35..344d9cf 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -49,6 +49,7 @@ jenkins_job_builder_pip_name: jenkins-job-builder
49# jenkins_job_builder_pip_extra_args: 49# jenkins_job_builder_pip_extra_args:
50# jenkins_job_builder_pip_version: 50# jenkins_job_builder_pip_version:
51# jenkins_job_builder_pip_virtualenv: 51# jenkins_job_builder_pip_virtualenv:
52# jenkins_job_builder_pip_executable:
52 53
53jenkins_job_builder_package_name: python-jenkins-job-builder 54jenkins_job_builder_package_name: python-jenkins-job-builder
54 55
diff --git a/tasks/install/git.yaml b/tasks/install/git.yaml
index 1d6560a..383b1fb 100644
--- a/tasks/install/git.yaml
+++ b/tasks/install/git.yaml
@@ -26,3 +26,4 @@
26 name: "file://{{ jenkins_job_builder_git_dest }}" 26 name: "file://{{ jenkins_job_builder_git_dest }}"
27 version: "{{ jenkins_job_builder_pip_version|default(omit) }}" 27 version: "{{ jenkins_job_builder_pip_version|default(omit) }}"
28 virtualenv: "{{ jenkins_job_builder_pip_virtualenv|default(omit) }}" 28 virtualenv: "{{ jenkins_job_builder_pip_virtualenv|default(omit) }}"
29 executable: "{{ jenkins_job_builder_pip_executable|default(omit) }}"
diff --git a/tasks/install/pip.yaml b/tasks/install/pip.yaml
index d4510da..5ef3cf3 100644
--- a/tasks/install/pip.yaml
+++ b/tasks/install/pip.yaml
@@ -19,3 +19,4 @@
19 name: "{{ jenkins_job_builder_pip_name }}" 19 name: "{{ jenkins_job_builder_pip_name }}"
20 version: "{{ jenkins_job_builder_pip_version|default(omit) }}" 20 version: "{{ jenkins_job_builder_pip_version|default(omit) }}"
21 virtualenv: "{{ jenkins_job_builder_pip_virtualenv|default(omit) }}" 21 virtualenv: "{{ jenkins_job_builder_pip_virtualenv|default(omit) }}"
22 executable: "{{ jenkins_job_builder_pip_executable|default(omit) }}"