From: Thanh Ha Date: Mon, 10 Sep 2018 22:00:19 +0000 (-0400) Subject: Change gjjb install to use symlinks in jjb-dir X-Git-Tag: v0.25.0~16 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F28%2F12528%2F3;p=releng%2Fglobal-jjb.git 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 --- 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 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"