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 "CSIT-PERF: New trigger design"
[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
f9181b0
..
3c962b9
100644
(file)
--- a/
jjb/csit/include-raw-csit-docs.sh
+++ b/
jjb/csit/include-raw-csit-docs.sh
@@
-5,13
+5,14
@@
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
[ "$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/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
@@
-21,7
+22,11
@@
fi
if [[ ${JOB_NAME} == *merge* ]]; then
if [[ ${JOB_NAME} == *merge* ]]; then
- cd ${BUILD_DIR}
+ cd ${WORKSPACE}
+
+ mkdir -p ${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">
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>
<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>