From fb764d5c558945041a034cd4d5d2526ec3ee32af Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Mon, 19 Sep 2016 10:03:39 -0700
Subject: 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>
---
 jjb/vpp/include-raw-vpp-docs.sh | 67 +++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 32 deletions(-)

(limited to 'jjb/vpp/include-raw-vpp-docs.sh')

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
-- 
cgit 1.2.3-korg