From b9876d17624e306206eb28bc5b6b28e2830636d2 Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Tue, 16 Oct 2018 12:22:26 -0700
Subject: [PATCH] Prepare for global-jjb v0.25.0

In preparation for global-jjb v.0.25.0 we need to move
jjb/global-jjb submodule to global-jjb to prevent JJB from
parsing tool YAMLs and translating them into Jenkins jobs.

Change-Id: I945d34ca71bb0d5281185600d5e5728a47575ed0
Issue-ID: CIMAN-33
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---
 .gitmodules                         | 4 ++--
 jjb/global-jjb => global-jjb        | 0
 jjb/global-jjb/jenkins-admin        | 1 +
 jjb/global-jjb/jenkins-init-scripts | 1 +
 jjb/global-jjb/jjb                  | 1 +
 jjb/global-jjb/shell                | 1 +
 6 files changed, 6 insertions(+), 2 deletions(-)
 rename jjb/global-jjb => global-jjb (100%)
 create mode 120000 jjb/global-jjb/jenkins-admin
 create mode 120000 jjb/global-jjb/jenkins-init-scripts
 create mode 120000 jjb/global-jjb/jjb
 create mode 120000 jjb/global-jjb/shell

diff --git a/.gitmodules b/.gitmodules
index 0fbb91acd..4e7fbade6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
-[submodule "jjb/global-jjb"]
-	path = jjb/global-jjb
+[submodule "global-jjb"]
+	path = global-jjb
 	url = https://github.com/lfit/releng-global-jjb
 [submodule "packer/common-packer"]
 	path = packer/common-packer
diff --git a/jjb/global-jjb b/global-jjb
similarity index 100%
rename from jjb/global-jjb
rename to global-jjb
diff --git a/jjb/global-jjb/jenkins-admin b/jjb/global-jjb/jenkins-admin
new file mode 120000
index 000000000..8e7fe05cc
--- /dev/null
+++ b/jjb/global-jjb/jenkins-admin
@@ -0,0 +1 @@
+../../global-jjb/jenkins-admin
\ No newline at end of file
diff --git a/jjb/global-jjb/jenkins-init-scripts b/jjb/global-jjb/jenkins-init-scripts
new file mode 120000
index 000000000..c7c6a9553
--- /dev/null
+++ b/jjb/global-jjb/jenkins-init-scripts
@@ -0,0 +1 @@
+../../global-jjb/jenkins-init-scripts
\ No newline at end of file
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
-- 
2.16.6