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

More updates to support latest django_jenkins

Browse Source
This commit is contained in:
James Laska
2014-10-02 13:26:32 -04:00
parent b37925149b
commit 888352270b
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -37,9 +37,9 @@ endif
MOCK_BIN ?= mock MOCK_BIN ?= mock
MOCK_CFG ?= MOCK_CFG ?=
.PHONY: clean rebase push requirements requirements_pypi develop refresh \ .PHONY: clean rebase push requirements requirements_pypi requirements_jenkins \
adduser syncdb migrate dbchange dbshell runserver celeryd receiver test \ develop refresh adduser syncdb migrate dbchange dbshell runserver celeryd \
test_coverage coverage_html test_ui test_jenkins dev_build \ receiver test test_coverage coverage_html test_ui test_jenkins dev_build \
release_build release_clean sdist rpm release_build release_clean sdist rpm
# Remove temporary build files, compiled Python files. # Remove temporary build files, compiled Python files.
@@ -88,7 +88,7 @@ requirements_pypi:
# (using locally downloaded packages). # (using locally downloaded packages).
requirements_jenkins: requirements requirements_jenkins: requirements
@if [ "$(VIRTUAL_ENV)" ]; then \ @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); \ (cd requirements && pip install -U pycrypto); \
$(PYTHON) fix_virtualenv_setuptools.py; \ $(PYTHON) fix_virtualenv_setuptools.py; \
else \ else \
@@ -190,7 +190,7 @@ test_tox:
# Run unit tests to produce output for Jenkins. # Run unit tests to produce output for Jenkins.
test_jenkins: test_jenkins:
$(PYTHON) manage.py jenkins -v2 $(PYTHON) manage.py jenkins -v2 --enable-coverage --project-apps-tests
Gruntfile.js: Gruntfile.js:
cp packaging/grunt/$@ $@ cp packaging/grunt/$@ $@

3
awx/settings/development.py
View File

@@ -27,14 +27,13 @@ CALLBACK_QUEUE_PORT = "ipc:///tmp/callback_receiver_dev.ipc"
try: try:
import django_jenkins import django_jenkins
INSTALLED_APPS += ('django_jenkins',) INSTALLED_APPS += ('django_jenkins',)
PROJECT_APPS = ('awx.main', 'awx.api',) PROJECT_APPS = ('awx.main.tests', 'awx.api.tests',)
except ImportError: except ImportError:
pass pass
if 'django_jenkins' in INSTALLED_APPS: if 'django_jenkins' in INSTALLED_APPS:
JENKINS_TASKS = ( JENKINS_TASKS = (
'django_jenkins.tasks.run_pylint', 'django_jenkins.tasks.run_pylint',
'django_jenkins.tasks.with_coverage',
'django_jenkins.tasks.run_pep8', 'django_jenkins.tasks.run_pep8',
'django_jenkins.tasks.run_pyflakes', 'django_jenkins.tasks.run_pyflakes',
'django_jenkins.tasks.run_jshint', 'django_jenkins.tasks.run_jshint',