Merge "amend download public IP and remove directory for bottlenecks upload job"

[releng.git] / jjb / opnfvdocs / opnfvdocs.yml

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 25e546b..de48aaf 100644 (file)
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -32,6 +32,10 @@
             project: $GERRIT_PROJECT
         - gerrit-parameter:
             branch: '{branch}'
+        - string:
+            name: GIT_CLONE_BASE
+            default: ssh://gerrit.opnfv.org:29418
+            description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
         - gerrit-trigger-scm:
@@ -64,7 +68,7 @@
     builders:
         - clone-opnfv-repos
         - build-html-and-pdf-docs-output
-#        - upload-under-review-docs-to-opnfv-artifacts
+        - upload-under-review-docs-to-opnfv-artifacts
         - report-docs-build-result-to-gerrit
 
 - job-template:
@@ -75,6 +79,10 @@
             project: $GERRIT_PROJECT
         - gerrit-parameter:
             branch: '{branch}'
+        - string:
+            name: GIT_CLONE_BASE
+            default: ssh://gerrit.opnfv.org:29418
+            description: "Used for overriding the GIT URL coming from parameters macro."
         - string:
             name: GS_URL
             default: '$GS_BASE{gs-pathname}'
@@ -119,6 +127,10 @@
             name: GS_URL
             default: '$GS_BASE{gs-pathname}'
             description: "Directory where the build artifact will be located upon the completion of the build."
+        - string:
+            name: GIT_CLONE_BASE
+            default: ssh://gerrit.opnfv.org:29418
+            description: "Used for overriding the GIT URL coming from parameters macro."
         - string:
             name: GERRIT_BRANCH
             default: '{branch}'
@@ -150,16 +162,16 @@
             # clone releng repo to get repo list
             cd $WORKSPACE
             echo "Cloning releng repo"
-            git clone $GIT_BASE/releng --quiet
+            git clone $GIT_CLONE_BASE/releng --branch master --depth 1 --quiet
 
             # clone rest of the repos and checkout the branch
             echo "Cloning repos of participating OPNFV Projects and checking out $GERRIT_BRANCH"
             echo
             echo "--------------------------------------------------------"
             for repo in $(grep -v '^#' $WORKSPACE/releng/jjb/opnfvdocs/project.cfg | sort); do
-                cd $WORKSPACE
+                cd $WORKSPACE/docs
                 echo "    $repo"
-                git clone $GIT_BASE/$repo --branch $GERRIT_BRANCH --quiet
+                git clone $GIT_CLONE_BASE/$repo --branch $GERRIT_BRANCH --depth 1 --quiet
             done
             echo "--------------------------------------------------------"
             echo