diff --git a/doc/upstream-training/source/slides/_assets/18-01-triggered.png b/doc/upstream-training/source/slides/_assets/18-01-triggered.png
deleted file mode 100644
index 651f0d1b..00000000
Binary files a/doc/upstream-training/source/slides/_assets/18-01-triggered.png and /dev/null differ
diff --git a/doc/upstream-training/source/slides/_assets/18-02-review.png b/doc/upstream-training/source/slides/_assets/18-02-review.png
deleted file mode 100644
index a189d0b7..00000000
Binary files a/doc/upstream-training/source/slides/_assets/18-02-review.png and /dev/null differ
diff --git a/doc/upstream-training/source/slides/_assets/18-03-error-report.png b/doc/upstream-training/source/slides/_assets/18-03-error-report.png
deleted file mode 100644
index d2a731ba..00000000
Binary files a/doc/upstream-training/source/slides/_assets/18-03-error-report.png and /dev/null differ
diff --git a/doc/upstream-training/source/slides/_assets/18-04-false-errors.png b/doc/upstream-training/source/slides/_assets/18-04-false-errors.png
deleted file mode 100644
index 68e3dc2f..00000000
Binary files a/doc/upstream-training/source/slides/_assets/18-04-false-errors.png and /dev/null differ
diff --git a/doc/upstream-training/source/slides/_assets/18-05-recheck.png b/doc/upstream-training/source/slides/_assets/18-05-recheck.png
deleted file mode 100644
index e5e9c5a4..00000000
Binary files a/doc/upstream-training/source/slides/_assets/18-05-recheck.png and /dev/null differ
diff --git a/doc/upstream-training/source/slides/_assets/workflow-project-status-and-zuul-failure-log.png b/doc/upstream-training/source/slides/_assets/workflow-project-status-and-zuul-failure-log.png
new file mode 100644
index 00000000..ab05917a
Binary files /dev/null and b/doc/upstream-training/source/slides/_assets/workflow-project-status-and-zuul-failure-log.png differ
diff --git a/doc/upstream-training/source/slides/_assets/workflow-project-status-and-zuul-jenkins-fail.png b/doc/upstream-training/source/slides/_assets/workflow-project-status-and-zuul-jenkins-fail.png
new file mode 100644
index 00000000..04cd85cd
Binary files /dev/null and b/doc/upstream-training/source/slides/_assets/workflow-project-status-and-zuul-jenkins-fail.png differ
diff --git a/doc/upstream-training/source/slides/_assets/workflow-project-status-and-zuul-zuul-page.png b/doc/upstream-training/source/slides/_assets/workflow-project-status-and-zuul-zuul-page.png
new file mode 100644
index 00000000..c2a68f0d
Binary files /dev/null and b/doc/upstream-training/source/slides/_assets/workflow-project-status-and-zuul-zuul-page.png differ
diff --git a/doc/upstream-training/source/slides/intro-introduction.rst b/doc/upstream-training/source/slides/intro-introduction.rst
index ae204ef2..39b6b9b8 100644
--- a/doc/upstream-training/source/slides/intro-introduction.rst
+++ b/doc/upstream-training/source/slides/intro-introduction.rst
@@ -51,7 +51,7 @@ Agenda - Day 2, morning
- Gerrit
- Reviewing
- Commit Messages
- - Jenkins
+ - Project Status and Zuul
- Metrics
- UC/WG intro
diff --git a/doc/upstream-training/source/slides/slide-index.rst b/doc/upstream-training/source/slides/slide-index.rst
index 00a95daa..3c467a88 100644
--- a/doc/upstream-training/source/slides/slide-index.rst
+++ b/doc/upstream-training/source/slides/slide-index.rst
@@ -40,7 +40,7 @@ Workflow and Tools for Participation
workflow-gerrit.rst
workflow-reviewing.rst
workflow-commit-message.rst
- workflow-jenkins.rst
+ workflow-project-status-and-zuul.rst
workflow-metrics.rst
workflow-setup-and-first-patch.rst
workflow-using-sandbox.rst
diff --git a/doc/upstream-training/source/slides/workflow-jenkins.rst b/doc/upstream-training/source/slides/workflow-jenkins.rst
deleted file mode 100644
index 5b07f0fd..00000000
--- a/doc/upstream-training/source/slides/workflow-jenkins.rst
+++ /dev/null
@@ -1,38 +0,0 @@
-=======
-Jenkins
-=======
-
-.. image:: ./_assets/os_background.png
- :class: fill
- :width: 100%
-
-Triggered on every commit
-=========================
-
-.. image:: ./_assets/18-01-triggered.png
-
-Review in gerrit
-================
-
-.. image:: ./_assets/18-02-review.png
-
-Error report
-============
-
-.. image:: ./_assets/18-03-error-report.png
-
-False errors
-============
-
-.. image:: ./_assets/18-04-false-errors.png
-
-Recheck bug #XXX
-================
-
-.. image:: ./_assets/18-05-recheck.png
- :width: 85%
-
-Exercise
-========
-
-add an error and match it to the jenkins message
diff --git a/doc/upstream-training/source/slides/workflow-project-status-and-zuul.rst b/doc/upstream-training/source/slides/workflow-project-status-and-zuul.rst
new file mode 100644
index 00000000..f313d407
--- /dev/null
+++ b/doc/upstream-training/source/slides/workflow-project-status-and-zuul.rst
@@ -0,0 +1,91 @@
+=================================
+OpenStack Project Status and Zuul
+=================================
+
+.. image:: ./_assets/os_background.png
+ :class: fill
+ :width: 100%
+
+OpenStack Infrastructure and Project Status
+===========================================
+- `http://status.openstack.org <http://status.openstack.org>`_
+
+ - Zuul
+ - Rechecks
+ - Reviews
+ - Bugday
+ - OpenStack-Health
+
+.. note::
+
+ - Zuul is the project gating and automation system that tests and merges
+ changes as well as publishing releases and documentation.
+ - Rechecks has a list of bugs and associated information for
+ nondeterministic check/gate failures.
+ - Reviews has a list of important reviews based on blueprint and bug priority
+ organized by project.
+ - Bugday shows real-time stats during bug smash days.
+ - OpenStack-Health has a dashboard of overal OpenStack test results.
+
+Zuul
+====
+
+.. image:: ./_assets/workflow-project-status-and-zuul-zuul-page.png
+
+Zuul Pipelines
+==============
+- Check
+
+ - Run against all newly updated patch sets
+ - Jenkins votes +1/-1 depending on test results
+
+- Gate
+
+ - Only run after a patch is approved by a core reviewer
+ - More extensive testing than check pipeline
+ - 'Gates' code entering the stable or master branches
+
+- Post
+
+ - Jobs run against a patch after it merges
+
+Exercise
+========
+- Look at the `Zuul <http://status.openstack.org/zuul>`_ status page
+
+ - Find the information that can be retrieved for each patch in a pipeline
+
+ - What happens if you click on a patch under test
+
+ - How many gate and check jobs are running
+ - Pick your favorite project and report how many jobs it has running in IRC
+ - What is the significance of the dots, lines and colors
+
+- Discuss your findings with your group
+
+Jenkins Failures
+================
+
+.. image:: ./_assets/workflow-project-status-and-zuul-jenkins-fail.png
+
+- Logs may be accessed by clicking on the test's name
+
+Log Output
+==========
+
+.. image:: ./_assets/workflow-project-status-and-zuul-failure-log.png
+
+Intermittent Failures
+=====================
+- Caused by timing/connectivity issues in check/gate
+- May receive elastic recheck message
+- List of `Rechecks <http://status.openstack.org/elastic-recheck>`_
+- To trigger a re-run of check or gate add a comment to the patch
+ in the form of 'recheck bug XXXXX'
+
+Exercise
+========
+- Find how rechecks are categorized
+- Discuss with your table how you would determine you encountered
+ one of these bugs
+
diff --git a/doc/upstream-training/source/website/index.rst b/doc/upstream-training/source/website/index.rst
index 7c86da62..16560dcf 100644
--- a/doc/upstream-training/source/website/index.rst
+++ b/doc/upstream-training/source/website/index.rst
@@ -149,7 +149,7 @@ Workflow and Tools for Participation
* `Gerrit <workflow-gerrit.html>`_
* `Reviewing <workflow-reviewing.html>`_
* `Commit Messages <workflow-commit-message.html>`_
-* `Jenkins <workflow-jenkins.html>`_
+* `Project Status and Zuul <workflow-project-status-and-zuul.html>`_
* `Metrics <workflow-metrics.html>`_
* `Guide to SetUp and Push First Patch
<workflow-setup-and-first-patch.html>`_