From 748aa2068bf0052a61adff61326a4896bae61b66 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 20 May 2019 07:56:14 +0200
Subject: [PATCH] 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
---
 .zuul.yaml             | 11 ++++-------
 test-requirements.txt  |  3 ++-
 tests/jobs/test_get.py |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index fabe89b..dde449f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,22 +10,19 @@
 
 - project:
     templates:
-      - docs-on-readthedocs
-      - publish-to-pypi
+      - docs-on-readthedocs-failing
+      - openstack-cover-jobs
+      - openstack-python35-jobs
+      - openstack-python36-jobs
     check:
       jobs:
         - openstack-tox-linters
         - openstack-tox-py27
-        - openstack-tox-py35
-        - openstack-tox-py36
         - openstack-tox-pypy:
             nodeset: ubuntu-bionic
         - jjb-tox-cross-jenkins-job-builder
     gate:
       jobs:
-        - build-openstack-sphinx-docs
         - openstack-tox-linters
         - openstack-tox-py27
-        - openstack-tox-py35
-        - openstack-tox-py36
         - jjb-tox-cross-jenkins-job-builder
diff --git a/test-requirements.txt b/test-requirements.txt
index b3ec1af..a16ec19 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,8 @@ unittest2
 python-subunit
 requests-mock>=1.4.0
 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
 testscenarios
 testtools
diff --git a/tests/jobs/test_get.py b/tests/jobs/test_get.py
index aec7c03..1379f78 100644
--- a/tests/jobs/test_get.py
+++ b/tests/jobs/test_get.py
@@ -128,7 +128,7 @@ class JenkinsGetJobsTest(JenkinsGetJobsTestBase):
         self.assertEqual(
             session_send_mock.call_args_list[1][0][1].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(
             str(context_manager.exception),