Rename to collection, add license, galaxy build

This commit is contained in:
AlanCoding
2019-09-17 15:48:00 -04:00
parent 2f0f692f4a
commit 35afa37417
6 changed files with 741 additions and 43 deletions

View File

@@ -18,7 +18,7 @@ COMPOSE_TAG ?= $(GIT_BRANCH)
COMPOSE_HOST ?= $(shell hostname)
VENV_BASE ?= /venv
MODULES_VENV ?= /awx_devel/awx_modules_test_venv
COLLECTION_VENV ?= /awx_devel/awx_collection_test_venv
SCL_PREFIX ?=
CELERY_SCHEDULE_FILE ?= /var/lib/awx/beat.db
@@ -374,30 +374,36 @@ test:
fi; \
PYTHONDONTWRITEBYTECODE=1 py.test -p no:cacheprovider -n auto $(TEST_DIRS)
cd awxkit && $(VENV_BASE)/awx/bin/tox -re py2,py3
make test_modules_all
make test_collection_all
awx-manage check_migrations --dry-run --check -n 'vNNN_missing_migration_file'
prepare_modules_venv:
prepare_collection_venv:
cd /awx_devel
rm -rf $(MODULES_VENV)
mkdir $(MODULES_VENV)
ln -s /usr/lib/python2.7/site-packages/ansible $(MODULES_VENV)/ansible
$(VENV_BASE)/awx/bin/pip install --target=$(MODULES_VENV) git+https://github.com/ansible/tower-cli.git
rm -rf $(COLLECTION_VENV)
mkdir $(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
MODULES_TEST_DIRS ?= awx_modules/test/awx
COLLECTION_TEST_DIRS ?= awx_modules/test/awx
COLLECTION_PACKAGE_NAME ?= awx
COLLECTION_NAMESPACE_NAME ?= awx
test_modules:
test_collection:
@if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/awx/bin/activate; \
fi; \
PYTHONPATH=$(MODULES_VENV):/awx_devel/awx_modules:$PYTHONPATH py.test $(MODULES_TEST_DIRS)
PYTHONPATH=$(COLLECTION_VENV):/awx_devel/awx_modules:$PYTHONPATH py.test $(COLLECTION_TEST_DIRS)
flake8_modules:
flake8_collection:
flake8 awx_modules/ # Different settings, in main exclude list
prepare_test_modules: prepare_modules_venv test_modules # deprecated
prepare_test_collection: prepare_collection_venv test_collection # deprecated
test_modules_all: prepare_modules_venv test_modules flake8_modules
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
test_unit:
@if [ "$(VENV_BASE)" ]; then \