From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Thu, 4 Apr 2019 19:32:10 +0000 (-0700)
Subject: Fix global-jjb docs for installation
X-Git-Tag: v0.36.0~10^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F00%2F15200%2F4;p=releng%2Fglobal-jjb.git

Fix global-jjb docs for installation

The docs copy / paste script use the GitHub submodule but don't properly
name the resultant module to match the expectations of the rest of the
script.

Fix up some minor inconsistencies / errors of other parts of script

Change-Id: I66402d9ef1be80c1dd53c51d55802a864c813421
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
---

diff --git a/docs/install.rst b/docs/install.rst
index 6a9c1366..52e0d5a7 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -104,14 +104,14 @@ Global JJB as follows:
    .. code-block:: bash
 
       GLOBAL_JJB_VERSION=v0.1.0
-      git submodule add https://github.com/lfit/releng-global-jjb.git
+      git submodule add https://github.com/lfit/releng-global-jjb.git global-jjb
       cd global-jjb
       git checkout $GLOBAL_JJB_VERSION
       cd ..
-      git add jjb/global-jjb
 
       # Setup symlinks
-      mkdir jjb/global-jjb
+      mkdir -p jjb/global-jjb
+      ln -s ../../global-jjb/jenkins-init-scripts jjb/global-jjb/jenkins-init-scripts
       ln -s ../../global-jjb/shell jjb/global-jjb/shell
       ln -s ../../global-jjb/jjb jjb/global-jjb/jjb
       git add jjb/global-jjb