summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJames Laska <jlaska@redhat.com>2016-09-20 22:24:09 +0200
committerJames Laska <jlaska@redhat.com>2016-09-21 21:27:44 +0200
commitdcf127ac6d5cb4f257f612d2a27f5a29e3e4d344 (patch)
tree85674e2272cce0f8f7ea711f8a0d316213ae2909 /Makefile
parentMerge pull request #3524 from wwitzel3/devel (diff)
downloadawx-dcf127ac6d5cb4f257f612d2a27f5a29e3e4d344.tar.xz
awx-dcf127ac6d5cb4f257f612d2a27f5a29e3e4d344.zip
Don't install csslint during requirements_jenkins
Diffstat (limited to '')
-rw-r--r--Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 2fcd0d1b75..fd0ef0228b 100644
--- a/Makefile
+++ b/Makefile
@@ -298,12 +298,10 @@ requirements_tower_dev:
# Install third-party requirements needed for running unittests in jenkins
requirements_jenkins:
if [ "$(VENV_BASE)" ]; then \
- . $(VENV_BASE)/tower/bin/activate; \
- $(VENV_BASE)/tower/bin/pip install -Ir requirements/requirements_jenkins.txt; \
+ . $(VENV_BASE)/tower/bin/activate && pip install -Ir requirements/requirements_jenkins.txt; \
else \
pip install -Ir requirements/requirements_jenkins.txt; \
- fi && \
- $(NPM_BIN) install csslint
+ fi
requirements: requirements_ansible requirements_tower