From 11f5d41df5fae1feb82c14d1e1577df70698ad00 Mon Sep 17 00:00:00 2001
From: Jeremy Phelps <jphelps@linuxfoundation.org>
Date: Fri, 30 Jun 2017 13:56:19 -0500
Subject: [PATCH] Checkout submodules recursively.

Change-Id: Ief3b0584cc25b9036b6a5e1e5d4f8c41cb754349
JIRA: CIMAN-4
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>
---
 jjb/ci-management/ci-management.yaml |  5 ++++-
 jjb/global-defaults.yaml             |  3 +++
 jjb/global-macros.yaml               |  1 +
 jjb/global-templates-java.yaml       | 23 +++++++++++++++++++++++
 jjb/global-templates-python.yaml     |  4 ++++
 jjb/global-templates-script.yaml     | 12 ++++++++++++
 6 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 27122dad5..3181eabca 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -12,7 +12,6 @@
     branch: 'master'
     build-timeout: '60'
     build-node: 'centos7-basebuild-2c-1g'
-
     platforms:
       - centos
       - ubuntu-16.04
@@ -48,6 +47,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -100,6 +100,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -150,6 +151,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -189,6 +191,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index f86509267..59b7bcd08 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -34,3 +34,6 @@
 
     # Set default maven version used for everything
     maven-version: 'mvn33'
+
+    # git submodule attributes
+    submodule-recursive: true
\ No newline at end of file
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index efc0d095b..d92fbd813 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -225,6 +225,7 @@
           skip-tag: true
           timeout: 30
           choosing-strategy: '{choosing-strategy}'
+          submodule-recursive: '{submodule-recursive}'
 
 - scm:
     name: gerrit-trigger-scm-basedir
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index c3e137951..1355e5175 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -91,6 +91,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -154,6 +155,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -215,6 +217,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -279,6 +282,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -339,6 +343,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -402,6 +407,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -477,6 +483,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -555,6 +562,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -619,6 +627,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -678,6 +687,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -744,6 +754,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -810,6 +821,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -862,6 +874,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -923,6 +936,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
     wrappers:
       - infra-wrappers:
           build-timeout: '{build-timeout}'
@@ -971,6 +985,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -1028,6 +1043,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -1098,6 +1114,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -1165,6 +1182,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -1251,6 +1269,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -1332,6 +1351,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -1408,6 +1428,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -1476,6 +1497,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -1528,6 +1550,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index d787b3831..ec9002eda 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -37,6 +37,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -89,6 +90,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -143,6 +145,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project1}'
           refspec: '{extra-refspec1}'
@@ -205,6 +208,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project1}'
           refspec: '{extra-refspec1}'
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 6e19c81bb..c2da1cd9e 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -36,6 +36,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -98,6 +99,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -163,6 +165,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -241,6 +244,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -321,6 +325,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project}'
           refspec: '{extra-refspec}'
@@ -397,6 +402,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project}'
           refspec: '{extra-refspec}'
@@ -474,6 +480,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project}'
           refspec: '{extra-refspec}'
@@ -552,6 +559,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
       - infra-wrappers:
@@ -620,6 +628,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project}'
           refspec: '{extra-refspec}'
@@ -699,6 +708,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project1}'
           refspec: '{extra-refspec1}'
@@ -772,6 +782,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project1}'
           refspec: '{extra-refspec1}'
@@ -844,6 +855,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project1}'
           refspec: '{extra-refspec1}'
-- 
2.16.6