X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fbifrost-verify-jobs.yml;h=920ecdc7d562dd5b0f751b27c359381e55d2bdee;hb=1a1f26ad80125bb78dda21ab8742fc064078d6a9;hp=f8d39b2fbac2dad19406a53e9cf8346fc19732d8;hpb=31ce289ac966e8ed104a431e659c1a98dcb54de6;p=releng.git

diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index f8d39b2fb..920ecdc7d 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -12,19 +12,19 @@
     # -------------------------------
     distro:
       - 'xenial':
-          disabled: false
+          disabled: true
           dib-os-release: 'xenial'
           dib-os-element: 'ubuntu-minimal'
           dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
           extra-dib-elements: 'openssh-server'
       - 'centos7':
-          disabled: false
+          disabled: true
           dib-os-release: '7'
           dib-os-element: 'centos-minimal'
           dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
           extra-dib-elements: 'openssh-server'
       - 'opensuse423':
-          disabled: false
+          disabled: true
           dib-os-release: '42.3'
           dib-os-element: 'opensuse-minimal'
           dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
@@ -70,16 +70,22 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'xci-verify-{distro}-.*'
+            - 'xci-.*-{distro}-merge-.*'
             - '.*-bifrost-verify.*-{type}'
+      - throttle:
+          max-per-node: 2
+          max-total: 10
+          categories:
+            - xci-verify-virtual
+          option: category
+
           block-level: 'NODE'
 
     parameters:
       - string:
           name: PROJECT_REPO
           default: 'https://git.openstack.org/openstack/bifrost'
-      - string:
-          name: CLONE_LOCATION
-          default: '$WORKSPACE/bifrost'
       - string:
           name: DISTRO
           default: '{distro}'
@@ -123,7 +129,7 @@
           name: SLAVE_LABEL
           default: 'xci-virtual'
       - string:
-          name: XCI_LOOP
+          name: CI_LOOP
           default: 'verify'
 
     scm:
@@ -148,7 +154,7 @@
     wrappers:
       - fix-workspace-permissions
       - build-timeout:
-          timeout: 90
+          timeout: 180
 
     publishers:
       # yamllint disable rule:line-length
@@ -156,6 +162,13 @@
           recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com julienjut@gmail.com
       # yamllint enable rule:line-length
       - email-jenkins-admins-on-failure
+      - postbuildscript:
+          script-only-if-succeeded: false
+          script-only-if-failed: false
+          builders:
+            - shell:
+                !include-raw: ./xci-cleanup.sh
+
 # -------------------------------
 # trigger macros
 # -------------------------------
@@ -173,6 +186,7 @@
             - comment-added-contains-event:
                 comment-contains-value: 'recheck'
           silent-start: true
+          custom-url: '* $JOB_NAME $BUILD_URL'
           projects:
             - project-compare-type: 'PLAIN'
               project-pattern: 'openstack/bifrost'