VPP: sphinx doc changes

Altered push location and makefile comannds
Moved sphinx builds into new stream containing only
new branches

Change-Id: I3bdb4ea709209e12e7c590f75c8b8f2ca648b60d
Signed-off-by: Ed Kern <ejk@cisco.com>

2 files changed, 63 insertions, 44 deletions

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 7adbebf33..2c7c3b233 100644
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -2,8 +2,6 @@
 - project:
     name: docs
     jobs:
-      - 'vpp-sphinx-docs-merge-{stream}'
-      - 'vpp-sphinx-docs-verify-{stream}'
       - 'vpp-docs-merge-{stream}'
       - 'vpp-docs-verify-{stream}'
       - 'vpp-make-test-docs-merge-{stream}'
@@ -34,6 +32,27 @@
       - short
       - long
 
+- project:
+    name: sphinx
+    jobs:
+      - 'vpp-sphinx-docs-merge-{stream}'
+      - 'vpp-sphinx-docs-verify-{stream}'
+
+    project: 'vpp'
+    os:
+      - ubuntu1604:
+          repo-os-part: 'ubuntu.xenial.main'
+
+    stream:
+      - master:
+          branch: 'master'
+          repo-stream-part: 'master'
+      - '1810':
+          branch: 'stable/1810'
+          repo-stream-part: 'stable.1810'
+    type:
+      - short
+      - long
 
 - job-template:
     name: 'vpp-docs-verify-{stream}'
@@ -92,18 +111,18 @@
           !include-raw-escape: include-raw-vpp-docs.sh
 
     publishers:
-      - archive:
-          artifacts: 'build-root/docs/html/*'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
+        - archive:
+            artifacts: 'docs/_build/html/*'
+            allow-empty: 'true'
+            fingerprint: false
+            only-if-success: true
+            default-excludes: false
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+        - naginator:
+            rerun-unstable-builds: false
+            max-failed-builds: 1
+            fixed-delay: 90
 
 - job-template:
     name: 'vpp-docs-merge-{stream}'
@@ -249,18 +268,18 @@
           !include-raw-escape: include-raw-vpp-sphinx-docs.sh
 
     publishers:
-      - archive:
-          artifacts: 'build-root/docs/html/*'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
+        - archive:
+            artifacts: 'docs/_build/html/*'
+            allow-empty: 'true'
+            fingerprint: false
+            only-if-success: true
+            default-excludes: false
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+        - naginator:
+            rerun-unstable-builds: false
+            max-failed-builds: 1
+            fixed-delay: 90
 
 - job-template:
     name: 'vpp-sphinx-docs-merge-{stream}'
@@ -326,18 +345,18 @@
           !include-raw-escape: include-raw-vpp-sphinx-docs.sh
 
     publishers:
-      - archive:
-          artifacts: 'build-root/docs/html/*'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
+        - archive:
+            artifacts: 'docs/_build/html/*'
+            allow-empty: 'true'
+            fingerprint: false
+            only-if-success: true
+            default-excludes: false
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+        - naginator:
+            rerun-unstable-builds: false
+            max-failed-builds: 1
+            fixed-delay: 90
 
 - job-template:
     name: 'vpp-make-test-docs-verify-{stream}'
diff --git a/jjb/vpp/include-raw-vpp-sphinx-docs.sh b/jjb/vpp/include-raw-vpp-sphinx-docs.sh
index 5ab0df27e..100dee6c5 100644
--- a/jjb/vpp/include-raw-vpp-sphinx-docs.sh
+++ b/jjb/vpp/include-raw-vpp-sphinx-docs.sh
@@ -3,19 +3,19 @@ set -xe -o pipefail
 [ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
 [ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/vpp
 [ "$DOC_FILE" ] || DOC_FILE=vpp.docs.zip
-[ "$DOC_DIR" ] || DOC_DIR=build-root/docs/html
-[ "$SITE_DIR" ] || SITE_DIR=build-root/docs/deploy-site/
+[ "$DOC_DIR" ] || DOC_DIR=./docs/_build/html
+[ "$SITE_DIR" ] || SITE_DIR=build-root/docs/deploy-site
 [ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources
 [ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn"
 [ "$VERSION" ] || VERSION=$(./build-root/scripts/version rpm-version)
 
-make doxygen
+make docs-venv
+make docs
 
 if [[ ${JOB_NAME} == *merge* ]]; then
   mkdir -p $(dirname ${RESOURCES_DIR})
   mv -f ${DOC_DIR} ${RESOURCES_DIR}
   cd ${SITE_DIR}
-  find . -type f '(' -name '*.md5' -o -name '*.dot' -o -name '*.map' ')' -delete
   cat > pom.xml << EOF
   <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -40,11 +40,11 @@ if [[ ${JOB_NAME} == *merge* ]]; then
     <distributionManagement>
       <site>
         <id>fdio-site</id>
-        <url>dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${VERSION}</url>
+        <url>dav:${DOCS_REPO_URL}/${PROJECT_PATH}/v${VERSION}</url>
       </site>
     </distributionManagement>
   </project>
 EOF
   ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C
   cd -
-fi
\ No newline at end of file
+fi