diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2016-09-09 13:45:30 -0700 |
|---|---|---|
| committer | Ed Warnicke <eaw@cisco.com> | 2016-09-09 13:46:25 -0700 |
| commit | dd0fc4b570efed9ea0cafc46508551308a011e1f (patch) | |
| tree | fb07d4597e5ca853d6fa09d633d78f2abaab716e | |
| parent | 3e387473ab01529ad9f4b53fa394af330985ee97 (diff) | |
Make work for all branches
Change-Id: I39b65b23b9733ace43dc881ca08861e6f08221e2
Signed-off-by: Ed Warnicke <eaw@cisco.com>
| -rw-r--r-- | jjb/vpp/include-raw-vpp-docs.sh | 9 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 8 |
2 files changed, 5 insertions, 12 deletions
diff --git a/jjb/vpp/include-raw-vpp-docs.sh b/jjb/vpp/include-raw-vpp-docs.sh index af9a50f3c..c3551c720 100644 --- 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 aa7d81a24..b63248b29 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-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 |