From 93e45225d50875c8ab204928e936074f63e22ab6 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Fri, 26 Oct 2018 00:35:29 +0200
Subject: [PATCH] Update CI jobs information in guide

Dont merge until [1] is merged.

[1] https://review.openstack.org/#/c/613439/

Change-Id: Ifc88fa3aa9cd8f63c148dd09cbdaebb6c15a8618
---
 doc/source/contributor/ci.rst | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/doc/source/contributor/ci.rst b/doc/source/contributor/ci.rst
index 4f57647..cf99f20 100644
--- a/doc/source/contributor/ci.rst
+++ b/doc/source/contributor/ci.rst
@@ -37,8 +37,9 @@ OpenStack modules: The code that configures Jenkins jobs is hosted by
      - Yes
      - Read the job logs to see where the code does not follow the Puppet
        syntax style.
-   * - puppet-openstack-unit-{4.8}
-     - RSpec tests for Puppet manifests.
+   * - puppet-openstack-unit-{4.10,5.5}
+     - RSpec tests for Puppet manifests on Puppet 4 (for Queens and earlier) and
+       Puppet 5 (for Rocky and beyond).
      - Yes
      - Read the job logs to see where the tests are failing. `More
        documentation about RSpec <http://rspec-puppet.com/tutorial/>`__
@@ -65,7 +66,16 @@ OpenStack modules: The code that configures Jenkins jobs is hosted by
        <https://github.com/puppetlabs/beaker/wiki>`__
    * - puppet-openstack-integration-4-scenarioX-tempest-{centos7,xenial}
      - Functional testing jobs that will deploy OpenStack run tempest smoke to
-       validate OpenStack is actually working when deploying with Puppet 3 and 4 versions.
+       validate OpenStack is actually working when deploying with Puppet 4 on Queens or earlier.
+       More details `here <https://github.com/openstack/puppet-openstack-integration#description>`__
+     - Yes
+     - Read the job logs. Sometimes, the job fails because of
+       packaging issues or mirrors downtime. Please report a bug for this so we
+       can find workarounds. It can also be a problem in Tempest, a new test
+       that is failing or a new parameter which is missing.
+   * - puppet-openstack-integration-5-scenarioX-tempest-{centos7,bionic}
+     - Functional testing jobs that will deploy OpenStack run tempest smoke to
+       validate OpenStack is actually working when deploying with Puppet 5 on Rocky and beyond.
        More details `here <https://github.com/openstack/puppet-openstack-integration#description>`__
      - Yes
      - Read the job logs. Sometimes, the job fails because of