Make work for all branches

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

diff --git a/jjb/vpp/include-raw-vpp-docs.sh b/jjb/vpp/include-raw-vpp-docs.sh
index af9a50f..c3551c7 100644 (file)
--- a/jjb/vpp/include-raw-vpp-docs.sh
+++ b/jjb/vpp/include-raw-vpp-docs.sh
@@ -8,14 +8,7 @@ set -xe -o pipefail
 [ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources
 [ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn"
 
-if [ "${GERRIT_BRANCH}" == "stable/1609" ]; then
-  VERSION=16.09
-else
-  echo "************************************"
-  echo "* ${GERRIT_BRANCH} does not publish docs  *"
-  echo "************************************"
-  exit
-fi
+[ "$VERSION" ] || VERSION=$(./build-root/scripts/version --rpm-version)
 
 make doxygen
 mkdir -p $(dirname ${RESOURCES_DIR})

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index aa7d81a..b63248b 100644 (file)
--- 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-1609'
+        - 'vpp-docs-{stream}'
 
     project: 'vpp'
     os:
@@ -340,7 +340,7 @@
             description: "TYPE parameter if not given by trigger"
 
 - job-template:
-    name: 'vpp-docs-1609'
+    name: 'vpp-docs-{stream}'
 
     project-type: freestyle
     node: 'verify-ubuntu1604'
@@ -356,7 +356,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'stable/1609'
+            branch: '{branch}'
         - os-parameter:
             os: 'ubuntu1604'
 
@@ -382,7 +382,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/stable/1609'
+                    branch-pattern: '**/{branch}'
             skip-vote:
                 successful: true
                 failed: true