summaryrefslogtreecommitdiffstats
path: root/jjb/vpp/docs.yaml
diff options
context:
space:
mode:
authorEd Kern <ejk@cisco.com>2018-10-11 10:37:08 -0600
committerEd Kern <ejk@cisco.com>2018-10-29 10:27:01 -0600
commite621897737bcfe66377cb0c66a56fbab05351740 (patch)
treecddeafc603404e62453e6113ee9086faaf0e9f35 /jjb/vpp/docs.yaml
parent4a60ebc8e56fe75aa44d9facd1c452ce3318277d (diff)
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>
Diffstat (limited to 'jjb/vpp/docs.yaml')
-rw-r--r--jjb/vpp/docs.yaml95
1 files changed, 57 insertions, 38 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}'