Browse Source

Unblocking the openstack-tox-docs job.

Fixing indentation error breaking openstack-tox-docs

Adjusts openstack-tox-docs job to be triggered by
the validations_common directory changes.

Introducing upper-requirements constraint to the
doc build dependencies.

Adjusts ansible_autodoc to handle missing molecule confs.

Signed-off-by: Jiri Podivin <jpodivin@redhat.com>
Change-Id: I8021f786476b61bbf88bf21a1151ce3198f7abbd
changes/82/791982/6
Jiri Podivin 4 weeks ago
parent
commit
1d2149e934
4 changed files with 28 additions and 25 deletions
  1. +1
    -0
      .zuul.yaml
  2. +24
    -24
      doc/source/_exts/ansible-autodoc.py
  3. +1
    -0
      tox.ini
  4. +2
    -1
      validations_common/tests/callback_plugins/test_validation_json.py

+ 1
- 0
.zuul.yaml View File

@ -69,6 +69,7 @@
files:
- ^doc/.*
- ^README.rst
- ^validations_common/.*
gate:
jobs:
- openstack-tox-linters


+ 24
- 24
doc/source/_exts/ansible-autodoc.py View File

@ -265,36 +265,36 @@ class AnsibleAutoPluginDirective(Directive):
)
with open(molecule_file) as f:
molecule_conf = DOCYAML.load(f.read())
driver_data = molecule_conf.get('driver')
if driver_data:
molecule_section.append(
nodes.field_name(
text='Driver: {}'.format(
driver_data['name']
if molecule_conf:
driver_data = molecule_conf.get('driver')
if driver_data:
molecule_section.append(
nodes.field_name(
text='Driver: {}'.format(
driver_data['name']
)
)
)
)
options = driver_data.get('options')
if options:
molecule_section.append(
self._yaml_section(
to_yaml_data=options,
section_title='Molecule Options'
options = driver_data.get('options')
if options:
molecule_section.append(
self._yaml_section(
to_yaml_data=options,
section_title='Molecule Options'
)
)
)
provisioner_data = molecule_conf.get('provisioner')
if provisioner_data:
inventory = provisioner_data.get('inventory')
if inventory:
molecule_section.append(
self._yaml_section(
to_yaml_data=inventory,
section_title='Molecule Inventory'
provisioner_data = molecule_conf.get('provisioner')
if provisioner_data:
inventory = provisioner_data.get('inventory')
if inventory:
molecule_section.append(
self._yaml_section(
to_yaml_data=inventory,
section_title='Molecule Inventory'
)
)
)
molecule_playbook_path = os.path.join(
molecule_path,


+ 1
- 0
tox.ini View File

@ -127,6 +127,7 @@ commands =
[testenv:docs]
deps =
-c {env:TOX_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r {toxinidir}/doc/requirements.txt
-r {toxinidir}/molecule-requirements.txt
commands=


+ 2
- 1
validations_common/tests/callback_plugins/test_validation_json.py View File

@ -44,7 +44,8 @@ def is_iso_time(time_string):
with the default delimiter.
Regex is somewhat convoluted, but general enough to last
at least until the 9999 AD.
Returns:
:returns:
True if string matches the pattern.
False otherwise.
"""


Loading…
Cancel
Save