From ce27221722b8ff15702e2884e839e4a39a4216e7 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Tue, 5 Jan 2016 11:24:57 +0100
Subject: Fix GIT_BASE for cloning standalone repos

GIT_BASE is set to <git_url>/<project> in default macros.
In order not to cause issues for other parts of the job and the script,
a new parameter GIT_CLONE_BASE has been introduced in order to clone repos
for composite doc generation.

Change-Id: I8ce0ea1e5324ce947a674b013cf7d169e6a9defe
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/opnfvdocs/opnfvdocs.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'jjb/opnfvdocs')

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 25e546b39..b6b0b1caa 100644
--- 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:
@@ -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,7 +162,7 @@
             # 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 --quiet
 
             # clone rest of the repos and checkout the branch
             echo "Cloning repos of participating OPNFV Projects and checking out $GERRIT_BRANCH"
@@ -159,7 +171,7 @@
             for repo in $(grep -v '^#' $WORKSPACE/releng/jjb/opnfvdocs/project.cfg | sort); do
                 cd $WORKSPACE
                 echo "    $repo"
-                git clone $GIT_BASE/$repo --branch $GERRIT_BRANCH --quiet
+                git clone $GIT_CLONE_BASE/$repo --branch $GERRIT_BRANCH --quiet
             done
             echo "--------------------------------------------------------"
             echo
-- 
cgit 1.2.3-korg