Upgrade to global-jjb v0.26.0

* Upgrade to global-jjb v0.26.0
* Prepare for global-jjb v0.27.0 with new macro variables

Change-Id: I094a083b56119f0ce881648dd0bbbe296ddd9855
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>

diff --git a/global-jjb b/global-jjb
index 70c97bb..877a36d 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 70c97bbbfbd071c6e75f7a3d47a453ee863c69ec
+Subproject commit 877a36dbad504f0cd245372f8ea9cc2fa660efa3

diff --git a/jjb/akraino-templates/akraino-jjb-docker.yaml b/jjb/akraino-templates/akraino-jjb-docker.yaml
index 7741f5e..b80a8a4 100644 (file)
--- a/jjb/akraino-templates/akraino-jjb-docker.yaml
+++ b/jjb/akraino-templates/akraino-jjb-docker.yaml
@@ -34,6 +34,7 @@
           refspec: ''
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:

diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml
index df1a32a..b78782f 100644 (file)
--- a/jjb/akraino-templates/akraino-jjb-templates.yaml
+++ b/jjb/akraino-templates/akraino-jjb-templates.yaml
@@ -96,6 +96,7 @@
           refspec: '{refspec}'
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeoute: '{submodule-timeout}'
           choosing-strategy: default
 
     triggers:

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index c07c139..4297d3c 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -6,6 +6,7 @@
     git-url: 'ssh://akraino-jobbuilder@gerrit.akraino.org:29418'
     jenkins-ssh-credential: jenkins-ssh
     lftools-version: '<1.0.0'
+    submodule-timeout: 10
 
     # Nexus 2 for jars
     mvn-snapshot-id: snapshots