X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-c-cpp-jobs.yaml;h=07e5ec4f2c66c72b4b6a76657409eaf553883c20;hb=f9e0c6aa3c19f8fc5c017f8a84e203d0d50d5b7f;hp=3584bf16b5b5c7d63c5ffd46cf81f4c20646101d;hpb=9cb04c8a479acc4e67891bdf425c62afae7445fa;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-c-cpp-jobs.yaml b/jjb/lf-c-cpp-jobs.yaml
index 3584bf16..07e5ec4f 100644
--- a/jjb/lf-c-cpp-jobs.yaml
+++ b/jjb/lf-c-cpp-jobs.yaml
@@ -25,6 +25,7 @@
     pre-build: ''
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
     version: ''
 
     #####################
@@ -44,7 +45,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-cmake-parameters:
           build-dir: '{build-dir}'
           cmake-opts: '{cmake-opts}'
@@ -89,7 +89,7 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     builders:
-      - shell: !include-raw-escape: ../shell/lftools-install.sh
+      - lf-infra-pre-build
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
@@ -116,6 +116,7 @@
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
 
     triggers:
@@ -150,6 +151,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -189,6 +191,7 @@
     pre-build: ''
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -224,7 +227,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-cmake-parameters:
           build-dir: '{build-dir}'
           cmake-opts: '{cmake-opts}'
@@ -256,6 +258,7 @@
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
 
     triggers:
@@ -288,6 +291,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'