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

Make sure requirements_jenkins invokes the other requirements sections

Browse Source
This commit is contained in:
Matthew Jones
2016-04-06 20:33:44 -04:00
parent 547506a3bf
commit 86cca77b43
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -279,6 +279,9 @@ requirements_tower_dev:
# Install third-party requirements needed for running unittests in jenkins # Install third-party requirements needed for running unittests in jenkins
requirements_jenkins: requirements_jenkins:
if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/tower/bin/activate; \
fi && \
pip install -r requirements/requirements_jenkins.txt pip install -r requirements/requirements_jenkins.txt
$(NPM_BIN) install csslint jshint $(NPM_BIN) install csslint jshint
@@ -286,6 +289,8 @@ requirements: virtualenv requirements_ansible requirements_tower
requirements_dev: requirements requirements_tower_dev requirements_dev: requirements requirements_tower_dev
requirements_test: requirements requirements_jenkins
# "Install" ansible-tower package in development mode. # "Install" ansible-tower package in development mode.
develop: develop:
@if [ "$(VIRTUAL_ENV)" ]; then \ @if [ "$(VIRTUAL_ENV)" ]; then \