diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2019-11-15 17:39:59 -0500 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2019-12-06 17:45:18 -0500 |
| commit | b30e58f9c58a7f5e690251254a41ca23a631fcc0 (patch) | |
| tree | ffc82f99b76127420c7c045847d2036e67e4f3b7 | |
| parent | ef218803adcfa4d19ce09b9f77a74961936e10b1 (diff) | |
vpp: make test-doc output moved
The patch to the vpp repo [0] moves the output of 'make test-doc'
into .../vpp/build-root/build-test/doc/html
[0] https://gerrit.fd.io/r/c/vpp/+/23480
Change-Id: I1885e37afd0b768a2eb115192d8d3c96119cef10
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
| -rw-r--r-- | jjb/vpp/docs.yaml | 2 | ||||
| -rw-r--r-- | jjb/vpp/include-raw-vpp-make-test-docs.sh | 2 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 72a064788..7c1b61fe3 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -436,7 +436,7 @@ project-type: freestyle node: ubuntu1804-us concurrent: false - archive-artifacts: '**/test/doc/build/html/*' + archive-artifacts: '**/build-root/build-test/doc/html/*' allow-empty: 'true' fingerprint: false only-if-success: true diff --git a/jjb/vpp/include-raw-vpp-make-test-docs.sh b/jjb/vpp/include-raw-vpp-make-test-docs.sh index dca1998aa..1f82ab502 100644 --- a/jjb/vpp/include-raw-vpp-make-test-docs.sh +++ b/jjb/vpp/include-raw-vpp-make-test-docs.sh @@ -2,7 +2,7 @@ set -xe -o pipefail [ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site" [ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/vpp -[ "$DOC_DIR" ] || DOC_DIR=test/doc/build/html +[ "$DOC_DIR" ] || DOC_DIR=build-root/build-test/doc/html [ "$SITE_DIR" ] || SITE_DIR=build-root/docs/deploy-site [ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources/vpp_make_test [ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn" diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index f69d0afef..5d8a32ab4 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -16,9 +16,6 @@ - master: branch: 'master' repo-stream-part: 'master' - - '1901': - branch: 'stable/1901' - repo-stream-part: 'stable.1901' - '1904': branch: 'stable/1904' repo-stream-part: 'stable.1904' |