diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2018-10-12 16:17:16 -0400 |
|---|---|---|
| committer | Aric Gardner <agardner@linuxfoundation.org> | 2018-10-12 16:18:41 -0400 |
| commit | 0028e2f29f979fbda078b81bda0369a7b3262179 (patch) | |
| tree | 4e02cfcc4f2341c5eb790f6689de2e78ec502924 | |
| parent | ccec11c5ad10c5dc40deb3907af01b7f86170cb9 (diff) | |
Prepare repo for global-jjb v0.25.0
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:
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"
Git diff confirms no changes.
diff -bur . /tmp/releng/job_output/
Change-Id: I6d7239b8bab8ef08368f833d9a64cd94a824b158
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
| -rw-r--r-- | .gitmodules | 2 | ||||
| m--------- | global-jjb (renamed from jjb/global-jjb) | 0 | ||||
| l--------- | jjb/global-jjb/jjb | 1 | ||||
| l--------- | jjb/global-jjb/shell | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 07b28be4b..9f7b77825 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "jjb/global-jjb"] - path = jjb/global-jjb + path = global-jjb url = https://github.com/lfit/releng-global-jjb diff --git a/jjb/global-jjb b/global-jjb -Subproject 18bb0a40f9ba00fd8417b32fbde9593b6d968c5 +Subproject 18bb0a40f9ba00fd8417b32fbde9593b6d968c5 diff --git a/jjb/global-jjb/jjb b/jjb/global-jjb/jjb new file mode 120000 index 000000000..23c884f04 --- /dev/null +++ b/jjb/global-jjb/jjb @@ -0,0 +1 @@ +../../global-jjb/jjb
\ No newline at end of file diff --git a/jjb/global-jjb/shell b/jjb/global-jjb/shell new file mode 120000 index 000000000..d37c43f86 --- /dev/null +++ b/jjb/global-jjb/shell @@ -0,0 +1 @@ +../../global-jjb/shell
\ No newline at end of file |