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

Force ui cleanup in the test environment

Browse Source 
Also allow using the system make
This commit is contained in:
Matthew Jones 2018-10-01 11:19:48 -04:00 committed by Matthew Jones
parent 89e41f7524
commit 56263a5fea
No known key found for this signature in database
GPG Key ID: EED42EEB8B369E1E
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -565,7 +565,7 @@ docker-compose-test: docker-auth
cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm --service-ports awx /bin/bash cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm --service-ports awx /bin/bash
docker-compose-runtest: docker-compose-runtest:
cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm --service-ports awx /start_tests.sh cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm --service-ports awx /start_tests.sh && docker-compose rm -sf
docker-compose-build: awx-devel-build docker-compose-build: awx-devel-build

2
tools/docker-compose/start_tests.sh
View File

@ -1,5 +1,5 @@
set +x set +x
make clean
cp -R /tmp/awx.egg-info /awx_devel/ || true cp -R /tmp/awx.egg-info /awx_devel/ || true
sed -i "s/placeholder/$(cat /awx_devel/VERSION)/" /awx_devel/awx.egg-info/PKG-INFO sed -i "s/placeholder/$(cat /awx_devel/VERSION)/" /awx_devel/awx.egg-info/PKG-INFO
cp /tmp/awx.egg-link /venv/awx/lib/python2.7/site-packages/awx.egg-link cp /tmp/awx.egg-link /venv/awx/lib/python2.7/site-packages/awx.egg-link

7
tox.ini
View File

@ -6,8 +6,9 @@ envlist =
api, api,
ui, ui,
; [testenv] [testenv]
; basepython = python2.7 ;basepython = python2.7
whitelist_externals = make
; setenv = ; setenv =
; DJANGO_SETTINGS_MODULE = awx.settings.development_quiet ; DJANGO_SETTINGS_MODULE = awx.settings.development_quiet
; SWIG_FEATURES = -cpperraswarn -includeall -I/usr/include/openssl ; SWIG_FEATURES = -cpperraswarn -includeall -I/usr/include/openssl
@ -29,6 +30,7 @@ commands =
deps = deps =
nodeenv nodeenv
commands = commands =
make clean-ui
make ui-devel make ui-devel
npm run --prefix awx/ui jshint npm run --prefix awx/ui jshint
npm run --prefix awx/ui lint npm run --prefix awx/ui lint
@ -56,5 +58,6 @@ commands =
deps = deps =
nodeenv nodeenv
commands = commands =
make clean-ui
make ui-devel make ui-devel
make ui-test-ci make ui-test-ci