Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix VPP docs merge job timeouts"
[ci-management.git]
/
jjb
/
csit
/
include-raw-csit-docs.sh
diff --git
a/jjb/csit/include-raw-csit-docs.sh
b/jjb/csit/include-raw-csit-docs.sh
index
789af15
..
3c962b9
100644
(file)
--- a/
jjb/csit/include-raw-csit-docs.sh
+++ b/
jjb/csit/include-raw-csit-docs.sh
@@
-4,15
+4,15
@@
set -xe -o pipefail
[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
[ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/csit
[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
[ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/csit
-[ "$DOC_FILE" ] || DOC_FILE=csit.docs.tar.gz
[ "$DOC_DIR" ] || DOC_DIR=resources/tools/doc_gen
[ "$DOC_DIR" ] || DOC_DIR=resources/tools/doc_gen
-[ "$SITE_DIR" ] || SITE_DIR=${DOC_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/doc
[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn"
cd ${DOC_DIR}
[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn"
cd ${DOC_DIR}
-
chmod +x ./run_doc.sh
chmod +x ./run_doc.sh
-./run_doc.sh
+./run_doc.sh
${GERRIT_BRANCH}
retval=$?
if [ ${retval} -ne "0" ]; then
retval=$?
if [ ${retval} -ne "0" ]; then
@@
-22,6
+22,10
@@
fi
if [[ ${JOB_NAME} == *merge* ]]; then
if [[ ${JOB_NAME} == *merge* ]]; then
+ cd ${WORKSPACE}
+
+ mkdir -p ${RESOURCES_DIR}
+ mv -f ${BUILD_DIR}/* ${RESOURCES_DIR}
cd ${SITE_DIR}
cat > pom.xml << EOF
cd ${SITE_DIR}
cat > pom.xml << EOF
@@
-46,7
+50,7
@@
if [[ ${JOB_NAME} == *merge* ]]; then
<distributionManagement>
<site>
<id>fdio-site</id>
<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>
</site>
</distributionManagement>
</project>