Fix version number extraction for all cases

[releng/global-jjb.git] / jjb / lf-c-cpp-jobs.yaml

diff --git a/jjb/lf-c-cpp-jobs.yaml b/jjb/lf-c-cpp-jobs.yaml
index 5e85448..07e5ec4 100644 (file)
--- a/jjb/lf-c-cpp-jobs.yaml
+++ b/jjb/lf-c-cpp-jobs.yaml
@@ -16,6 +16,7 @@
     build-timeout: 15
     cmake-opts: ''
     cron: '@daily'
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     install-prefix: '$BUILD_DIR/output'
@@ -24,6 +25,7 @@
     pre-build: ''
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
     version: ''
 
     #####################
@@ -32,6 +34,7 @@
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -42,7 +45,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-cmake-parameters:
           build-dir: '{build-dir}'
           cmake-opts: '{cmake-opts}'
@@ -87,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}'
@@ -114,6 +116,7 @@
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
 
     triggers:
@@ -148,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}'
 
@@ -179,6 +183,7 @@
     build-dir: '$WORKSPACE/target'
     build-timeout: 15
     cmake-opts: ''
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     install-prefix: '$BUILD_DIR/output'
@@ -186,6 +191,7 @@
     pre-build: ''
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -210,6 +216,7 @@
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -220,7 +227,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-cmake-parameters:
           build-dir: '{build-dir}'
           cmake-opts: '{cmake-opts}'
@@ -252,6 +258,7 @@
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
 
     triggers:
@@ -284,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}'