Prepare repo for global-jjb v0.25.0

The global-jjb is using tools that have non-JJB YAML files in it's
repo. We need to restructure the repo in a way that JJB does not pick
up these YAMLs and try to parse them as JJB.

Issue: https://jira.linuxfoundation.org/browse/RELENG-1204
Change-Id: Icadfc39c02f28d5dabc18b0ddc0de98d293fcb7f
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/.gitmodules b/.gitmodules
index 6536c9b8b63a16bb74967de74838d07c9b84546c..cfe5e35d53f3113a789f16e811dbd6f374bd57ba 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "jjb/global-jjb"]
-       path = jjb/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/defaults.yaml b/jjb/defaults.yaml
index e6e1c2f424abeeae56fdbca1054ee7ac7ffa7740..305c52e1be67a630f68dffac8471ae871fdae934 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -44,7 +44,6 @@
     nexus-snapshot-repo: opendaylight.snapshot
     git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
     lftools-version: <1.0.0
-    packer-version: 1.2.4
 
     # defaults for parameters installing openstack for csit jobs
     devstack-hash: ''

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