From b94a82bd078988fbfb58496cb1ac835d48e5ec6e Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 10 Sep 2018 18:00:19 -0400
Subject: [PATCH] Change gjjb install to use symlinks in jjb-dir

Update global-jjb install instructions to symlink the jjb and shell
directories in global-jjb and clone the submodule to the root of
ci-management instead.

This allows us to use tools that have YAML file configurations that
JJB will otherwise pick up and parse as invalid JJB config.

Issue: RELENG-1204
Change-Id: I5060dd0c1b67fa020a84844936eebb970ae2cbb6
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 docs/install.rst                                        | 13 ++++++++++---
 .../global-jjb-install-symlinks-a03bfc8e84b14874.yaml   | 17 +++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/global-jjb-install-symlinks-a03bfc8e84b14874.yaml

diff --git a/docs/install.rst b/docs/install.rst
index fb7a649e..6a9c1366 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -104,11 +104,18 @@ Global JJB as follows:
    .. code-block:: bash
 
       GLOBAL_JJB_VERSION=v0.1.0
-      git submodule add https://github.com/lfit/releng-global-jjb.git jjb/global-jjb
-      cd jjb/global-jjb
+      git submodule add https://github.com/lfit/releng-global-jjb.git
+      cd global-jjb
       git checkout $GLOBAL_JJB_VERSION
-      cd ../..
+      cd ..
       git add jjb/global-jjb
+
+      # Setup symlinks
+      mkdir jjb/global-jjb
+      ln -s ../../global-jjb/shell jjb/global-jjb/shell
+      ln -s ../../global-jjb/jjb jjb/global-jjb/jjb
+      git add jjb/global-jjb
+
       git commit -sm "Install global-jjb $GLOBAL_JJB_VERSION"
 
    .. note::
diff --git a/releasenotes/notes/global-jjb-install-symlinks-a03bfc8e84b14874.yaml b/releasenotes/notes/global-jjb-install-symlinks-a03bfc8e84b14874.yaml
new file mode 100644
index 00000000..c250c31d
--- /dev/null
+++ b/releasenotes/notes/global-jjb-install-symlinks-a03bfc8e84b14874.yaml
@@ -0,0 +1,17 @@
+---
+upgrade:
+  - |
+    Global JJB now has non-JJB YAML configuration and requires action on the
+    ci-management repo when upgrading to this version of Global JJB to prevent
+    JJB from picking up these YAMLs as config. Follow the instructions below
+    BEFORE upgrading globall-jjb:
+
+    .. code-block:: bash
+
+       cd <git-root>
+       git mv jjb/global-jjb global-jjb
+       mkdir jjb/global-jjb
+       ln -s ../../global-jjb/shell jjb/global-jjb/shell
+       ln -s ../../global-jjb/jjb jjb/global-jjb/jjb
+       git add jjb/global-jjb
+       git commit -sm "Prepare repo for global-jjb v0.25.0"
-- 
2.16.6