External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-10 15:32:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

update references to collection folder

Browse Source
This commit is contained in:
AlanCoding 2019-09-17 15:58:35 -04:00
parent 98619c5e23
commit 75bb7aae14
No known key found for this signature in database
GPG Key ID: FD2C3C012A72926B
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -137,5 +137,5 @@ use_dev_supervisor.txt
# Ansible module tests
awx_collection_test_venv/
awx_modules/*.tar.gz
awx_modules/galaxy.yml
awx_collection/*.tar.gz
awx_collection/galaxy.yml

10
Makefile
View File

@ -384,7 +384,7 @@ prepare_collection_venv:
ln -s /usr/lib/python2.7/site-packages/ansible $(COLLECTION_VENV)/ansible
$(VENV_BASE)/awx/bin/pip install --target=$(COLLECTION_VENV) git+https://github.com/ansible/tower-cli.git
COLLECTION_TEST_DIRS ?= awx_modules/test/awx
COLLECTION_TEST_DIRS ?= awx_collection/test/awx
COLLECTION_PACKAGE_NAME ?= awx
COLLECTION_NAMESPACE_NAME ?= awx
@ -392,18 +392,18 @@ test_collection:
@if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/awx/bin/activate; \
fi; \
PYTHONPATH=$(COLLECTION_VENV):/awx_devel/awx_modules:$PYTHONPATH py.test $(COLLECTION_TEST_DIRS)
PYTHONPATH=$(COLLECTION_VENV):/awx_devel/awx_collection:$PYTHONPATH py.test $(COLLECTION_TEST_DIRS)
flake8_collection:
flake8 awx_modules/ # Different settings, in main exclude list
flake8 awx_collection/ # Different settings, in main exclude list
prepare_test_collection: prepare_collection_venv test_collection # deprecated
test_collection_all: prepare_collection_venv test_collection flake8_collection
build_collection:
ansible-playbook -i localhost, awx_modules/template_galaxy.yml -e package_name=$(COLLECTION_PACKAGE_NAME) -e namespace_name=$(COLLECTION_NAMESPACE_NAME) -e package_version=$(VERSION)
ansible-galaxy collection build awx_modules --output-path=awx_modules
ansible-playbook -i localhost, awx_collection/template_galaxy.yml -e package_name=$(COLLECTION_PACKAGE_NAME) -e namespace_name=$(COLLECTION_NAMESPACE_NAME) -e package_version=$(VERSION)
ansible-galaxy collection build awx_collection --output-path=awx_collection
test_unit:
@if [ "$(VENV_BASE)" ]; then \

4
awx_collection/README.md
View File

@ -25,7 +25,7 @@ to be the python in that virtual environment.
## Running Tests
Tests to verify compatibility with the most recent AWX code are
in `awx_modules/test/awx`. These tests require that python packages
in `awx_collection/test/awx`. These tests require that python packages
are available for all of `awx`, `ansible`, `tower_cli`, and the collection
itself.
@ -34,7 +34,7 @@ in the `awx_collection_test_venv` folder so that `make test_collection` can
be ran to actually run the tests. A single test can be ran via:
```
make test_collection MODULE_TEST_DIRS=awx_modules/test/awx/test_organization.py
make test_collection MODULE_TEST_DIRS=awx_collection/test/awx/test_organization.py
```
## Building

2
setup.cfg
View File

@ -18,4 +18,4 @@ exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory/ec2.py,awx/plugins
[flake8]
max-line-length=160
ignore=E201,E203,E221,E225,E231,E241,E251,E261,E265,E303,W291,W391,W293,E731,W504
exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory,awx/ui,awx/api/urls.py,awx/main/migrations,awx/main/tests/data,node_modules/,awx/projects/,tools/docker,awx/settings/local_*.py,installer/openshift/settings.py,build/,installer/,awxkit/test,awx_modules/
exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory,awx/ui,awx/api/urls.py,awx/main/migrations,awx/main/tests/data,node_modules/,awx/projects/,tools/docker,awx/settings/local_*.py,installer/openshift/settings.py,build/,installer/,awxkit/test,awx_collection/