Add a vpp-docs-verify job and move vpp-docs to vpp-merge-docs

Change-Id: I76f4823c2453d03beb57d013f04e087f86ef7dca
Signed-off-by: Ed Warnicke <eaw@cisco.com>

2 files changed, 102 insertions, 34 deletions

diff --git a/jjb/vpp/include-raw-vpp-docs.sh b/jjb/vpp/include-raw-vpp-docs.sh
index 889037d51..5ab0df27e 100644
--- a/jjb/vpp/include-raw-vpp-docs.sh
+++ b/jjb/vpp/include-raw-vpp-docs.sh
@@ -10,38 +10,41 @@ set -xe -o pipefail
 [ "$VERSION" ] || VERSION=$(./build-root/scripts/version rpm-version)
 
 make doxygen
-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>
-  <groupId>io.fd.vpp</groupId>
-  <artifactId>docs</artifactId>
-  <version>1.0.0</version>
-  <packaging>pom</packaging>
 
-  <properties>
-    <generateReports>false</generateReports>
-  </properties>
+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>
+    <groupId>io.fd.vpp</groupId>
+    <artifactId>docs</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
 
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-         <artifactId>wagon-webdav-jackrabbit</artifactId>
-         <version>2.9</version>
-      </extension>
-    </extensions>
-  </build>
-  <distributionManagement>
-    <site>
-      <id>fdio-site</id>
-      <url>dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${VERSION}</url>
-    </site>
-  </distributionManagement>
-</project>
+    <properties>
+      <generateReports>false</generateReports>
+    </properties>
+
+    <build>
+      <extensions>
+        <extension>
+          <groupId>org.apache.maven.wagon</groupId>
+           <artifactId>wagon-webdav-jackrabbit</artifactId>
+           <version>2.9</version>
+        </extension>
+      </extensions>
+    </build>
+    <distributionManagement>
+      <site>
+        <id>fdio-site</id>
+        <url>dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${VERSION}</url>
+      </site>
+    </distributionManagement>
+  </project>
 EOF
-${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C
-cd -
+  ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C
+  cd -
+fi
\ No newline at end of file
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 7439634db..5df99688f 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -4,7 +4,7 @@
         - 'vpp-verify-{stream}-{os}'
         - 'vpp-merge-{stream}-{os}'
         - 'vpp-verify-image-{stream}-{os}'
-        - 'vpp-docs-{stream}'
+        - 'vpp-docs-merge-{stream}'
 
     project: 'vpp'
     os:
@@ -350,7 +350,65 @@
             description: "TYPE parameter if not given by trigger"
 
 - job-template:
-    name: 'vpp-docs-{stream}'
+    name: 'vpp-docs-verify-{stream}'
+
+    project-type: freestyle
+    node: 'verify-ubuntu1604'
+    concurrent: true
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - os-parameter:
+            os: 'ubuntu1604'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - maven-target:
+            maven-version: '{mvn33}'
+            goals: '--version'
+            settings: 'vpp-settings'
+            settings-type: cfp
+            global-settings: 'global-settings'
+            global-settings-type: cfp
+        - provide-maven-settings:
+            settings-file: 'vpp-settings'
+            global-settings-file: 'global-settings'
+        - shell:
+            !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
+
+- job-template:
+    name: 'vpp-docs-merge-{stream}'
 
     project-type: freestyle
     node: 'verify-ubuntu1604'
@@ -415,4 +473,11 @@
             global-settings-file: 'global-settings'
         - shell:
             !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