External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 02:19:58 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3352 from AlanCoding/js_makefile

Browse Source 
Updating Jenkins UI targets, and pin pytest in devel
This commit is contained in:
Alan Rominger 2016-08-29 11:34:37 -04:00 committed by GitHub
commit f9cd0fe197
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -298,7 +298,7 @@ requirements_jenkins:
else \
pip install -Ir requirements/requirements_jenkins..txt; \
fi && \
$(NPM_BIN) install csslint jshint
$(NPM_BIN) install csslint
requirements: requirements_ansible requirements_tower
@ -435,13 +435,22 @@ check: flake8 pep8 # pyflakes pylint
TEST_DIRS=awx/main/tests
# Run all API unit tests.
test:
@if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/tower/bin/activate; \
fi; \
py.test $(TEST_DIRS)
test_unit:
@if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/tower/bin/activate; \
fi; \
py.test awx/main/tests/unit
# Run all API unit tests with coverage enabled.
test_coverage:
@if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/tower/bin/activate; \
fi; \
py.test --create-db --cov=awx --cov-report=xml --junitxml=./reports/junit.xml $(TEST_DIRS)
# Output test coverage as HTML (into htmlcov directory).
@ -478,6 +487,13 @@ ui-test: ui-deps-built
ui-test-ci: ui-deps-built
$(NPM_BIN) --prefix awx/ui run test:ci
testjs_ci:
echo "Update UI unittests later" #ui-test-ci
jshint: ui-deps-built
grunt --gruntfile awx/ui/Gruntfile.js jshint
# Depends on node 6.x and npm 3.x installed on Jenkins slave
ui-test-saucelabs: ui-deps-built
$(NPM_BIN) --prefix awx/ui run test:saucelabs

2
awx/main/queue.py
View File

@ -3,8 +3,6 @@
import json
from django.conf import settings
__all__ = ['FifoQueue']
# TODO: Figure out wtf to do with this class

2
requirements/requirements_dev.txt
View File

@ -5,7 +5,7 @@ unittest2
pep8
flake8
pyflakes==1.0.0 # Pinned until PR merges https://gitlab.com/pycqa/flake8/merge_requests/56
pytest
pytest==2.9.2
pytest-cov
pytest-django
pytest-pythonpath

2
requirements/requirements_jenkins.txt
View File

@ -6,7 +6,7 @@ pylint
flake8
distribute==0.7.3
unittest2
pytest
pytest==2.9.2
pytest-cov
pytest-django
pytest-pythonpath

2
tools/docker-compose/Dockerfile
View File

@ -12,7 +12,7 @@ RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash -
RUN yum -y localinstall http://yum.postgresql.org/9.4/redhat/rhel-6-x86_64/pgdg-centos94-9.4-1.noarch.rpm
ADD tools/docker-compose/proot.repo /etc/yum.repos.d/proot.repo
RUN yum -y update && yum -y install openssh-server ansible mg vim tmux git mercurial subversion python-devel python-psycopg2 make postgresql postgresql-devel nodejs python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel zeromq-devel proot python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel
RUN pip install flake8 pytest pytest-pythonpath pytest-django pytest-cov pytest-mock dateutils django-debug-toolbar==1.4 pyflakes==1.0.0 virtualenv
RUN pip install flake8 pytest==2.9.2 pytest-pythonpath pytest-django pytest-cov pytest-mock dateutils django-debug-toolbar==1.4 pyflakes==1.0.0 virtualenv
RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa
RUN mkdir -p /etc/tower
RUN mkdir -p /data/db