From 07e41547b8dbb034ae746105d886405f4af943f7 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 25 May 2019 17:59:34 +0200 Subject: [PATCH] Update jobs Remove tox-linters job, the default job now runs on bionic, so there's no need to use an extra job. Replace it with the default job. Replace obsolete build-openstack-sphinx-docs with new template build-openstack-docs-pti which calls "tox -e docs" directly. Update tox.ini for this to use python3. Fix URL in docs to use new location of repo after OpenDev rename. Change-Id: I8c46d95ae1156af01eb07fe7559bbf9e751cf055 --- .zuul.yaml | 15 ++++----------- doc/source/conf.py | 2 +- tox.ini | 1 + 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 93462c9..617cb97 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,17 +1,10 @@ --- -- job: - name: openstack-tox-linters-npm - parent: openstack-tox-linters - # bionic needed for less ancient nodejs/npm which would fail to install - # cspell regardless engines mentioned in package.json - nodeset: ubuntu-bionic - - project: + templates: + - build-openstack-docs-pti check: jobs: - - build-openstack-sphinx-docs - - openstack-tox-linters-npm + - openstack-tox-linters gate: jobs: - - build-openstack-sphinx-docs - - openstack-tox-linters-npm + - openstack-tox-linters diff --git a/doc/source/conf.py b/doc/source/conf.py index b14b9ca..b68bffd 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -22,7 +22,7 @@ extensions = [ ] # openstackdocstheme options -repository_name = 'openstack/coats' +repository_name = 'x/coats' use_storyboard = True bug_tag = '' diff --git a/tox.ini b/tox.ini index 6edac60..d4f807c 100644 --- a/tox.ini +++ b/tox.ini @@ -35,6 +35,7 @@ whitelist_externals = xargs [testenv:docs] +basepython = python3 deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -b html -W doc/source doc/build/html