CSIT: unpin wagon version

[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 d8e4bf6..0bc8264 100644 (file)
--- a/jjb/csit/include-raw-csit-docs.sh
+++ b/jjb/csit/include-raw-csit-docs.sh
@@ -7,12 +7,12 @@ set -xe -o pipefail
 [ "$DOC_DIR" ] || DOC_DIR=resources/tools/doc_gen
 [ "$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
+[ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources/doc
 [ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn"
 
 cd ${DOC_DIR}
 chmod +x ./run_doc.sh
-./run_doc.sh
+./run_doc.sh ${GERRIT_BRANCH}
 
 retval=$?
 if [ ${retval} -ne "0" ]; then
@@ -24,7 +24,7 @@ if [[ ${JOB_NAME} == *merge* ]]; then
 
   cd ${WORKSPACE}
 
-  mkdir -p $(dirname ${RESOURCES_DIR})
+  mkdir -p ${RESOURCES_DIR}
   mv -f ${BUILD_DIR}/* ${RESOURCES_DIR}
   cd ${SITE_DIR}
 
@@ -43,7 +43,6 @@ if [[ ${JOB_NAME} == *merge* ]]; then
         <extension>
           <groupId>org.apache.maven.wagon</groupId>
           <artifactId>wagon-webdav-jackrabbit</artifactId>
-          <version>2.9</version>
         </extension>
       </extensions>
     </build>