Update jobs

The repo uses docs-on-read-the-docs, remove extra
build-openstack-sphinx gate job.

Without this change, two docs jobs would be building in gate, tox-docs
and build-sphinx. One is enough.

Also, use templates instead of individual jobs.

Import other templates from project-config, use the failing docs
template since readthedocs is not setup yet.

Remove publish-to-pypi, this should stay in project-config.

Fix sphinx requirements for python 3.

Fix decoding in failing test.

Change-Id: Ic4f715b45c1284ea49339e96c2aa87b2e81fcbea
This commit is contained in:
Andreas Jaeger 2019-05-20 07:56:14 +02:00
parent a5615d04f8
commit 748aa2068b
3 changed files with 7 additions and 9 deletions

View File

@ -10,22 +10,19 @@
- project: - project:
templates: templates:
- docs-on-readthedocs - docs-on-readthedocs-failing
- publish-to-pypi - openstack-cover-jobs
- openstack-python35-jobs
- openstack-python36-jobs
check: check:
jobs: jobs:
- openstack-tox-linters - openstack-tox-linters
- openstack-tox-py27 - openstack-tox-py27
- openstack-tox-py35
- openstack-tox-py36
- openstack-tox-pypy: - openstack-tox-pypy:
nodeset: ubuntu-bionic nodeset: ubuntu-bionic
- jjb-tox-cross-jenkins-job-builder - jjb-tox-cross-jenkins-job-builder
gate: gate:
jobs: jobs:
- build-openstack-sphinx-docs
- openstack-tox-linters - openstack-tox-linters
- openstack-tox-py27 - openstack-tox-py27
- openstack-tox-py35
- openstack-tox-py36
- jjb-tox-cross-jenkins-job-builder - jjb-tox-cross-jenkins-job-builder

View File

@ -6,7 +6,8 @@ unittest2
python-subunit python-subunit
requests-mock>=1.4.0 requests-mock>=1.4.0
requests-kerberos requests-kerberos
sphinx>=1.6.0 sphinx>=1.6.0,<2.0.0;python_version=='2.7' # BSD
sphinx>=1.6.0;python_version>='3.4' # BSD
stestr>=2.0.0 stestr>=2.0.0
testscenarios testscenarios
testtools testtools

View File

@ -128,7 +128,7 @@ class JenkinsGetJobsTest(JenkinsGetJobsTestBase):
self.assertEqual( self.assertEqual(
session_send_mock.call_args_list[1][0][1].url, session_send_mock.call_args_list[1][0][1].url,
self.make_url( self.make_url(
'view/Test%20View/api/json?tree=jobs[url,color,name]' 'view/Test%20View/api/json?tree=jobs%5Burl,color,name%5D'
)) ))
self.assertEqual( self.assertEqual(
str(context_manager.exception), str(context_manager.exception),