commit 05f06084a3a1e6098fd5dba0cfa65bab7c8f08f3
author Zack Williams <zdw@opennetworking.org> Wed Jan 22 14:19:34 2020 -0700
committer Zack Williams <zdw@opennetworking.org> Wed Jan 22 14:19:34 2020 -0700
tree 0f002ae2eb1298ffbd7972f3fe798ce7f370f4aa
parent 9fea0cd26b7f414bcaa81a2514ac59b649be7401

Compatibility updates to lfit global-jjb 0.49.0, jenkins-job-builder 3.2.0

Change-Id: If5b209d1274596b2147d589593e949eddb9ba214

jjb/templates/make-test.yaml

diff --git a/jjb/templates/make-test.yaml b/jjb/templates/make-test.yaml
index 2928e64..f8b1c69 100644
--- a/jjb/templates/make-test.yaml
+++ b/jjb/templates/make-test.yaml
@@ -32,7 +32,7 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
-          submodule-recursive: 'false'
+          submodule-recursive: '{submodule-recursive}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           basedir: '{project}'

jjb/templates/sync-dir.yaml

diff --git a/jjb/templates/sync-dir.yaml b/jjb/templates/sync-dir.yaml
index 8faa101..362ea0b 100644
--- a/jjb/templates/sync-dir.yaml
+++ b/jjb/templates/sync-dir.yaml
@@ -52,7 +52,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
-          submodule-recursive: 'false'
+          submodule-disable: '{submodule-disable}'
+          submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{gerrit-ssh-credential}'
 

jjb/templates/verify-licensed.yaml

diff --git a/jjb/templates/verify-licensed.yaml b/jjb/templates/verify-licensed.yaml
index 48bf37a..fe4ef6d 100644
--- a/jjb/templates/verify-licensed.yaml
+++ b/jjb/templates/verify-licensed.yaml
@@ -30,7 +30,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
-          submodule-recursive: 'false'
+          submodule-disable: '{submodule-disable}'
+          submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 

jjb/templates/versioning.yaml

diff --git a/jjb/templates/versioning.yaml b/jjb/templates/versioning.yaml
index 9e2f164..5c56f33 100644
--- a/jjb/templates/versioning.yaml
+++ b/jjb/templates/versioning.yaml
@@ -49,7 +49,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
-          submodule-recursive: 'false'
+          submodule-disable: '{submodule-disable}'
+          submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{gerrit-ssh-credential}'
 
@@ -95,7 +97,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
-          submodule-recursive: 'false'
+          submodule-disable: '{submodule-disable}'
+          submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{gerrit-ssh-credential}'