External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1085 from ryanpetrello/fix-7876

Browse Source 
fix a bug in custom venv support that breaks legacy `POST /api/v1/jobs`
This commit is contained in:
Ryan Petrello
2018-01-30 16:21:10 -05:00
committed by GitHub
parent a9b77eb706 8fed469975
commit 20a999f846
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/jobs.py
View File

@@ -518,7 +518,7 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana
def ansible_virtualenv_path(self): def ansible_virtualenv_path(self):
# the order here enforces precedence (it matters) # the order here enforces precedence (it matters)
for virtualenv in ( for virtualenv in (
self.job_template.custom_virtualenv, self.job_template.custom_virtualenv if self.job_template else None,
self.project.custom_virtualenv, self.project.custom_virtualenv,
self.project.organization.custom_virtualenv self.project.organization.custom_virtualenv
): ):

13
awx/main/tests/functional/models/test_job.py
View File

@@ -1,6 +1,6 @@
import pytest import pytest
from awx.main.models import JobTemplate from awx.main.models import JobTemplate, Job
@pytest.mark.django_db @pytest.mark.django_db
@@ -38,3 +38,14 @@ def test_awx_custom_virtualenv(inventory, project, machine_credential):
job.job_template.custom_virtualenv = '/venv/fancy-jt' job.job_template.custom_virtualenv = '/venv/fancy-jt'
job.job_template.save() job.job_template.save()
assert job.ansible_virtualenv_path == '/venv/fancy-jt' assert job.ansible_virtualenv_path == '/venv/fancy-jt'
@pytest.mark.django_db
def test_awx_custom_virtualenv_without_jt(project):
project.custom_virtualenv = '/venv/fancy-proj'
project.save()
job = Job(project=project)
job.save()
job = Job.objects.get(pk=job.id)
assert job.ansible_virtualenv_path == '/venv/fancy-proj'