Merge "Clone Releng with submodules to include jjb"

[releng.git] / jjb / container4nfv / container4nfv-project.yml

diff --git a/jjb/container4nfv/container4nfv-project.yml b/jjb/container4nfv/container4nfv-project.yml
index 03bbb65..194a1a9 100644 (file)
--- a/jjb/container4nfv/container4nfv-project.yml
+++ b/jjb/container4nfv/container4nfv-project.yml
@@ -18,7 +18,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
@@ -36,7 +36,8 @@
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+          description: "Used for overriding the GIT URL coming from Global Jenkins\
+            \ configuration in case if the stuff is done on none-LF HW."
       # yamllint enable rule:line-length
       - 'opnfv-build-ubuntu-defaults'
 
@@ -109,8 +110,21 @@
 
     properties:
       - logrotate-default
+      - throttle:
+          enabled: true
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'clover-daily-deploy-.*?'
+            - 'container4nfv-daily-deploy-.*?'
+          block-level: 'NODE'
 
     wrappers:
+      - timeout:
+          timeout: 240
+          abort: true
       - fix-workspace-permissions
 
     parameters:
@@ -121,7 +135,8 @@
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+          description: "Used for overriding the GIT URL coming from Global Jenkins\
+            \ configuration in case if the stuff is done on none-LF HW."
       # yamllint enable rule:line-length
       - node:
           name: SLAVE_NAME