From 6f2febadc9daa43df1c0a663ffa52c2b6bdebe25 Mon Sep 17 00:00:00 2001
From: agardner <agardner@linuxfoundation.org>
Date: Fri, 20 Oct 2017 13:29:47 -0400
Subject: Move all doc verfication to docs-verify-rtd-*

Ready for review (tested locally)

1) remove opnfvdocs-daily-{stream}:
We don't need a timed docs build. and it did not build anything usefull

2) remove opnfv-docs-verify-{stream}:
This uses depreciated and unmaintained opnfvdocs/scripts/docs-build.sh
It does not clone submodules and gives no usefull feedback
but it does post to artifacts and give a gerrit comment
move that functionality to docs-*-rtd-*

3) remove opnfv-docs-merge-{stream}:
does not upload anything meaningful

4) remove macro upload-generated-docs-to-opnfv-artifacts:
is no longer needed since we use read the docs

5) improve docs-verify-rtd-{stream}:
generate single page html and post to artifacts
send gerrit commment with location of single page html,
errors (like malformed table) are embedded nicely in the single
page output and give devs a single source of feedback on their work

6) improve docs-merge-rtd-{stream}:
this job now needs to remove review documenation created by
docs-verify-rtd-{stream}

TODO, after this is merged:
remove now unused opnfvdocs/scripts/docs-build.sh

Change-Id: I802eb11712d42555d34f986d061bf0dfc623c1e9
Signed-off-by: agardner <agardner@linuxfoundation.org>
---
 jjb/opnfvdocs/docs-rtd.yaml |  3 +++
 jjb/opnfvdocs/opnfvdocs.yml | 29 -----------------------------
 2 files changed, 3 insertions(+), 29 deletions(-)

(limited to 'jjb/opnfvdocs')

diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index c98959524..a8b9bef7b 100644
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -36,6 +36,7 @@
           files: 'docs/**/*.*'
 
     builders:
+      - 'remove-old-docs-from-opnfv-artifacts'
       - shell: |
           if [ $GERRIT_BRANCH == "master" ]; then
             RTD_BUILD_VERSION=latest
@@ -89,4 +90,6 @@
           pip install --upgrade pip
           pip freeze
           pip install tox
+          sed -i s,\-b\ html,\-b\ singlehtml,g tox.ini
           tox -edocs
+      - 'upload-review-docs'
diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 95bc8a9dd..3dfb9d155 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -11,7 +11,6 @@
     jobs:
       - 'opnfvdocs-verify-shellcheck-{stream}'
       - 'opnfvdocs-merge-shellcheck-{stream}'
-      - 'opnfvdocs-daily-{stream}'
 
     stream:
       - master:
@@ -109,31 +108,3 @@
 
     builders:
       - check-bash-syntax
-
-- job-template:
-    name: 'opnfvdocs-daily-{stream}'
-
-    disabled: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - string:
-          name: GS_URL
-          default: '$GS_BASE{gs-pathname}'
-          description: "Directory where the build artifact will be located upon the completion of the build."
-      - string:
-          name: GIT_CLONE_BASE
-          default: ssh://gerrit.opnfv.org:29418
-          description: "Used for overriding the GIT URL coming from parameters macro."
-
-    scm:
-      - git-scm
-
-    triggers:
-      - timed: '0 H/6 * * *'
-
-    builders:
-      - build-html-and-pdf-docs-output
-#     - upload-generated-docs-to-opnfv-artifacts
-- 
cgit 1.2.3-korg