Fix yamllint error and sync version with module_utils

This commit is contained in:
AlanCoding 2020-06-10 08:59:08 -04:00
parent 96583e9e6b
commit a7fe5e1dd2
No known key found for this signature in database
GPG Key ID: FD2C3C012A72926B
6 changed files with 32 additions and 30 deletions

View File

@ -9,29 +9,30 @@
# (* Changed to the base README.md file are lost upon *)
# (* the build of the collection *)
# (********************************************************)
---
authors:
- AWX Project Contributors <awx-project@googlegroups.com>
- AWX Project Contributors <awx-project@googlegroups.com>
dependencies: {}
description: Ansible content that interacts with the AWX or Ansible Tower API.
documentation: https://github.com/ansible/awx/blob/devel/awx_collection/README.md
homepage: https://www.ansible.com/
issues: https://github.com/ansible/awx/issues?q=is%3Aissue+label%3Acomponent%3Aawx_collection
license:
- GPL-3.0-only
- GPL-3.0-only
name: awx
namespace: awx
readme: README.md
repository: https://github.com/ansible/awx
tags:
- cloud
- infrastructure
- awx
- ansible
- automation
- cloud
- infrastructure
- awx
- ansible
- automation
version: 0.0.1-devel
build_ignore:
- tools
- setup.cfg
- galaxy.yml.j2
- template_galaxy.yml
- '*.tar.gz'
- tools
- setup.cfg
- galaxy.yml.j2
- template_galaxy.yml
- '*.tar.gz'

View File

@ -33,7 +33,7 @@ class ItemNotDefined(Exception):
class TowerModule(AnsibleModule):
# This gets set by the make process so whatever is in here is irrelevant
_COLLECTION_VERSION = "devel"
_COLLECTION_VERSION = "0.0.1-devel"
_COLLECTION_TYPE = "awx"
# This maps the collections type (awx/tower) to the values returned by the API
# Those values can be found in awx/api/generics.py line 204

View File

@ -108,7 +108,7 @@ def run_module(request, collection_import):
sanitize_dict(py_data)
resp._content = bytes(json.dumps(django_response.data), encoding='utf8')
resp.status_code = django_response.status_code
resp.headers = {'X-API-Product-Name': 'AWX', 'X-API-Product-Version': 'devel'}
resp.headers = {'X-API-Product-Name': 'AWX', 'X-API-Product-Version': '0.0.1-devel'}
if request.config.getoption('verbose') > 0:
logger.info(

View File

@ -93,9 +93,9 @@ def test_no_templated_values(collection_import):
checked into source.
"""
TowerModule = collection_import('plugins.module_utils.tower_api').TowerModule
assert TowerModule._COLLECTION_VERSION == "devel", (
assert TowerModule._COLLECTION_VERSION == "0.0.1-devel", (
'The collection version is templated when the collection is built '
'and the code should retain the placeholder of "devel".'
'and the code should retain the placeholder of "0.0.1-devel".'
)
InventoryModule = collection_import('plugins.inventory.tower').InventoryModule
assert InventoryModule.NAME == 'awx.awx.tower', (

View File

@ -9,29 +9,30 @@
# (* Changed to the base README.md file are lost upon *)
# (* the build of the collection *)
# (********************************************************)
---
authors:
- AWX Project Contributors <awx-project@googlegroups.com>
- AWX Project Contributors <awx-project@googlegroups.com>
dependencies: {}
description: Ansible content that interacts with the AWX or Ansible Tower API.
documentation: https://github.com/ansible/awx/blob/devel/awx_collection/README.md
homepage: https://www.ansible.com/
issues: https://github.com/ansible/awx/issues?q=is%3Aissue+label%3Acomponent%3Aawx_collection
license:
- GPL-3.0-only
- GPL-3.0-only
name: {{ collection_package }}
namespace: {{ collection_namespace }}
readme: README.md
repository: https://github.com/ansible/awx
tags:
- cloud
- infrastructure
- awx
- ansible
- automation
- cloud
- infrastructure
- awx
- ansible
- automation
version: {{ collection_version_override | default(collection_version) }}
build_ignore:
- tools
- setup.cfg
- galaxy.yml.j2
- template_galaxy.yml
- '*.tar.gz'
- tools
- setup.cfg
- galaxy.yml.j2
- template_galaxy.yml
- '*.tar.gz'

View File

@ -27,13 +27,13 @@
set_fact:
collection_version_override: 0.0.1-devel
- name: Template the galaxy.yml file
- name: Template the galaxy.yml source file
template:
src: "{{ collection_source }}/tools/roles/template_galaxy/templates/galaxy.yml.j2"
dest: "{{ collection_source }}/galaxy.yml"
force: true
- name: Template the README.md file
- name: Template the README.md source file
template:
src: "{{ collection_source }}/tools/roles/template_galaxy/templates/README.md.j2"
dest: "{{ collection_source }}/README.md"