External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-24 14:36:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Reduce duplicated logic for genschema target

Browse Source
This commit is contained in:
Elijah DeLee
2018-11-06 15:22:07 -05:00
parent f737fc066f
commit d70cd113e1
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -1,3 +1,6 @@
# Ignore generated schema
swagger.json
schema.json
# Tags # Tags
.tags .tags

8
Makefile
View File

@@ -11,7 +11,6 @@ GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
MANAGEMENT_COMMAND ?= awx-manage MANAGEMENT_COMMAND ?= awx-manage
IMAGE_REPOSITORY_AUTH ?= IMAGE_REPOSITORY_AUTH ?=
IMAGE_REPOSITORY_BASE ?= https://gcr.io IMAGE_REPOSITORY_BASE ?= https://gcr.io
VERSION := $(shell cat VERSION) VERSION := $(shell cat VERSION)
# NOTE: This defaults the container image version to the branch that's active # NOTE: This defaults the container image version to the branch that's active
@@ -339,16 +338,13 @@ pylint: reports
@(set -o pipefail && $@ | reports/$@.report) @(set -o pipefail && $@ | reports/$@.report)
genschema: reports genschema: reports
@if [ "$(VENV_BASE)" ]; then \ $(MAKE) swagger PYTEST_ARGS="--genschema"
. $(VENV_BASE)/awx/bin/activate; \
fi; \
(set -o pipefail && py.test --genschema awx/conf/tests/functional awx/main/tests/functional/api awx/main/tests/docs --release=$(VERSION_TARGET) | tee reports/$@.report)
swagger: reports swagger: reports
@if [ "$(VENV_BASE)" ]; then \ @if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/awx/bin/activate; \ . $(VENV_BASE)/awx/bin/activate; \
fi; \ fi; \
(set -o pipefail && py.test awx/conf/tests/functional awx/main/tests/functional/api awx/main/tests/docs --release=$(VERSION_TARGET) | tee reports/$@.report) (set -o pipefail && py.test $(PYTEST_ARGS) awx/conf/tests/functional awx/main/tests/functional/api awx/main/tests/docs --release=$(VERSION_TARGET) | tee reports/$@.report)
check: flake8 pep8 # pyflakes pylint check: flake8 pep8 # pyflakes pylint