From 888352270b12a9e442f888dba72e06d020465577 Mon Sep 17 00:00:00 2001 From: James Laska Date: Thu, 2 Oct 2014 13:26:32 -0400 Subject: [PATCH] More updates to support latest django_jenkins --- Makefile | 10 +++++----- awx/settings/development.py | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 6f54c68edb..f79904b8f0 100644 --- a/Makefile +++ b/Makefile @@ -37,9 +37,9 @@ endif MOCK_BIN ?= mock MOCK_CFG ?= -.PHONY: clean rebase push requirements requirements_pypi develop refresh \ - adduser syncdb migrate dbchange dbshell runserver celeryd receiver test \ - test_coverage coverage_html test_ui test_jenkins dev_build \ +.PHONY: clean rebase push requirements requirements_pypi requirements_jenkins \ + develop refresh adduser syncdb migrate dbchange dbshell runserver celeryd \ + receiver test test_coverage coverage_html test_ui test_jenkins dev_build \ release_build release_clean sdist rpm # Remove temporary build files, compiled Python files. @@ -88,7 +88,7 @@ requirements_pypi: # (using locally downloaded packages). requirements_jenkins: requirements @if [ "$(VIRTUAL_ENV)" ]; then \ - (cd requirements && pip install -r jenkins.txt); \ + (cd requirements && pip install -U -r jenkins.txt); \ (cd requirements && pip install -U pycrypto); \ $(PYTHON) fix_virtualenv_setuptools.py; \ else \ @@ -190,7 +190,7 @@ test_tox: # Run unit tests to produce output for Jenkins. test_jenkins: - $(PYTHON) manage.py jenkins -v2 + $(PYTHON) manage.py jenkins -v2 --enable-coverage --project-apps-tests Gruntfile.js: cp packaging/grunt/$@ $@ diff --git a/awx/settings/development.py b/awx/settings/development.py index 522a267a91..5b88d30778 100644 --- a/awx/settings/development.py +++ b/awx/settings/development.py @@ -27,14 +27,13 @@ CALLBACK_QUEUE_PORT = "ipc:///tmp/callback_receiver_dev.ipc" try: import django_jenkins INSTALLED_APPS += ('django_jenkins',) - PROJECT_APPS = ('awx.main', 'awx.api',) + PROJECT_APPS = ('awx.main.tests', 'awx.api.tests',) except ImportError: pass if 'django_jenkins' in INSTALLED_APPS: JENKINS_TASKS = ( 'django_jenkins.tasks.run_pylint', - 'django_jenkins.tasks.with_coverage', 'django_jenkins.tasks.run_pep8', 'django_jenkins.tasks.run_pyflakes', 'django_jenkins.tasks.run_jshint',