Merge "VPP: dev-contrib to ext-debs"

diff --git a/.gitmodules b/.gitmodules
index 07b28be..9f7b778 100644 (file)
--- 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/global-jjb b/global-jjb
new file mode 160000 (submodule)
index 0000000..70c97bb
--- /dev/null
+++ b/global-jjb
@@ -0,0 +1 @@
+Subproject commit 70c97bbbfbd071c6e75f7a3d47a453ee863c69ec

diff --git a/jjb/global-jjb b/jjb/global-jjb
deleted file mode 160000 (submodule)
index 8e33e6a..0000000
--- a/jjb/global-jjb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8e33e6ab798cd57a383cb8871d973de3fce6340c

diff --git a/jjb/global-jjb/jenkins-admin b/jjb/global-jjb/jenkins-admin
new file mode 120000 (symlink)
index 0000000..8e7fe05
--- /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 (symlink)
index 0000000..c7c6a95
--- /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 (symlink)
index 0000000..23c884f
--- /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 (symlink)
index 0000000..d37c43f
--- /dev/null
+++ b/jjb/global-jjb/shell
@@ -0,0 +1 @@
+../../global-jjb/shell
\ No newline at end of file