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

Move django_jenkins into development.py

Browse Source
This commit is contained in:
James Laska
2014-06-05 15:00:21 -04:00
parent 38bfbb4b46
commit e8dc57ff36
3 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -175,7 +175,7 @@ test_tox:
# Run unit tests to produce output for Jenkins. # Run unit tests to produce output for Jenkins.
test_jenkins: test_jenkins:
DJANGO_SETTINGS_MODULE="awx.settings.jenkins" $(PYTHON) manage.py jenkins -v2 $(PYTHON) manage.py jenkins -v2
package.json: package.json:
sed -e 's/%NAME%/$(NAME)/;s/%VERSION%/$(VERSION)/' packaging/grunt/package.template > $@ sed -e 's/%NAME%/$(NAME)/;s/%VERSION%/$(VERSION)/' packaging/grunt/package.template > $@

24
awx/settings/development.py
View File

@@ -6,6 +6,7 @@
# Python # Python
import sys import sys
import traceback import traceback
import glob
# Django Split Settings # Django Split Settings
from split_settings.tools import optional, include from split_settings.tools import optional, include
@@ -22,6 +23,29 @@ if 'celeryd' in sys.argv:
CALLBACK_CONSUMER_PORT = "tcp://127.0.0.1:5557" CALLBACK_CONSUMER_PORT = "tcp://127.0.0.1:5557"
CALLBACK_QUEUE_PORT = "ipc:///tmp/callback_receiver_dev.ipc" CALLBACK_QUEUE_PORT = "ipc:///tmp/callback_receiver_dev.ipc"
# Use Django-Jenkins if installed. Only run tests for awx.main app.
try:
import django_jenkins
INSTALLED_APPS += ('django_jenkins',)
PROJECT_APPS = ('awx.main', 'awx.api',)
except ImportError:
pass
if 'django_jenkins' in INSTALLED_APPS:
JENKINS_TASKS = (
'django_jenkins.tasks.run_pylint',
'django_jenkins.tasks.with_coverage',
'django_jenkins.tasks.django_tests',
'django_jenkins.tasks.run_pep8',
'django_jenkins.tasks.run_pyflakes',
'django_jenkins.tasks.run_jshint',
'django_jenkins.tasks.run_csslint',
)
PEP8_RCFILE = "setup.cfg"
CSSLINT_CHECKED_FILES = glob.glob(os.path.join(BASE_DIR, 'ui/static/less/*.less'))
JSHINT_CHECKED_FILES = [os.path.join(BASE_DIR, 'ui/static/js'),
os.path.join(BASE_DIR, 'ui/static/lib/ansible'),]
# If any local_*.py files are present in awx/settings/, use them to override # If any local_*.py files are present in awx/settings/, use them to override
# default settings for development. If not present, we can still run using # default settings for development. If not present, we can still run using
# only the defaults. # only the defaults.

27
awx/settings/jenkins.py
View File

@@ -1,13 +1,7 @@
# Copyright (c) 2014 AnsibleWorks, Inc. # Copyright (c) 2014 AnsibleWorks, Inc.
# All Rights Reserved. # All Rights Reserved.
# Test settings for AWX project. # Development settings for AWX project, but with DEBUG disabled
# Python
import glob
# Django Split Settings
from split_settings.tools import optional, include
# Load development settings. # Load development settings.
from defaults import * from defaults import *
@@ -19,22 +13,3 @@ from development import *
DEBUG = False DEBUG = False
TEMPLATE_DEBUG = DEBUG TEMPLATE_DEBUG = DEBUG
SQL_DEBUG = DEBUG SQL_DEBUG = DEBUG
# Use Django-Jenkins if installed. Only run tests for awx.main app.
import django_jenkins
INSTALLED_APPS += ('django_jenkins',)
PROJECT_APPS = ('awx.main', 'awx.api',)
JENKINS_TASKS = (
'django_jenkins.tasks.run_pylint',
'django_jenkins.tasks.with_coverage',
# 'django_jenkins.tasks.django_tests',
'django_jenkins.tasks.run_pep8',
'django_jenkins.tasks.run_pyflakes',
'django_jenkins.tasks.run_jshint',
'django_jenkins.tasks.run_csslint',
)
PEP8_RCFILE = "setup.cfg"
CSSLINT_CHECKED_FILES = glob.glob(os.path.join(BASE_DIR, 'ui/static/less/*.less'))
JSHINT_CHECKED_FILES = [os.path.join(BASE_DIR, 'ui/static/js'),
os.path.join(BASE_DIR, 'ui/static/lib/ansible'),]