diff options
| author |   Ed Warnicke <hagbard@gmail.com> | 2017-01-18 18:02:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2017-01-18 18:02:43 +0000 |
| commit | cf9b024548743289ac1f656e618bc892700b67d2 (patch) | |
| tree | 81f1495a0b467125e72eb6b8d4b5cf532338f2fc | |
| parent | 34a52573dcaa90bcc67591df7491585a101cf21a (diff) | |
| parent | 2b2e0f8d5d10f3ab87616b9252b72aca293ae2c7 (diff) | |
Merge "CSIT-474: CSIT documentation publishing"
| -rw-r--r-- | jjb/csit/include-raw-csit-docs.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/jjb/csit/include-raw-csit-docs.sh b/jjb/csit/include-raw-csit-docs.sh index f9181b07e..d8e4bf62e 100644 --- a/jjb/csit/include-raw-csit-docs.sh +++ b/jjb/csit/include-raw-csit-docs.sh @@ -5,11 +5,12 @@ set -xe -o pipefail [ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site" [ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/csit [ "$DOC_DIR" ] || DOC_DIR=resources/tools/doc_gen -[ "$BUILD_DIR" ] || BUILD_DIR=_build +[ "$BUILD_DIR" ] || BUILD_DIR=${DOC_DIR}/_build +[ "$SITE_DIR" ] || SITE_DIR=build-root/docs/deploy-site +[ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources/html [ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn" cd ${DOC_DIR} - chmod +x ./run_doc.sh ./run_doc.sh @@ -21,7 +22,11 @@ fi if [[ ${JOB_NAME} == *merge* ]]; then - cd ${BUILD_DIR} + cd ${WORKSPACE} + + mkdir -p $(dirname ${RESOURCES_DIR}) + mv -f ${BUILD_DIR}/* ${RESOURCES_DIR} + cd ${SITE_DIR} 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"> @@ -45,7 +50,7 @@ if [[ ${JOB_NAME} == *merge* ]]; then <distributionManagement> <site> <id>fdio-site</id> - <url>dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${STREAM}</url> + <url>dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${GERRIT_BRANCH}</url> </site> </distributionManagement> </project> |