Merge "barometer_docker: add barometer-snmp to build"

[releng.git] / jjb / xci / bifrost-verify-jobs.yml

diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index 137787d..7e01175 100644 (file)
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -8,33 +8,23 @@
       - master:
           branch: '{stream}'
     # -------------------------------
-    # projects
-    # -------------------------------
-    project:
-      - 'openstack':
-          project-repo: 'https://git.openstack.org/openstack/bifrost'
-          clone-location: '$WORKSPACE/bifrost'
-      - 'opnfv':
-          project-repo: 'https://gerrit.opnfv.org/gerrit/releng-xci'
-          clone-location: '$WORKSPACE/releng-xci'
-    # -------------------------------
     # distros
     # -------------------------------
     distro:
       - 'xenial':
-          disabled: true
+          disabled: false
           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: true
+          disabled: false
           dib-os-release: '7'
           dib-os-element: 'centos-minimal'
           dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
           extra-dib-elements: 'openssh-server'
-      - 'suse':
-          disabled: true
+      - 'opensuse423':
+          disabled: false
           dib-os-release: '42.3'
           dib-os-element: 'opensuse-minimal'
           dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
@@ -48,7 +38,7 @@
     # jobs
     # -------------------------------
     jobs:
-      - '{project}-bifrost-verify-{distro}-{type}-{stream}'
+      - 'openstack-bifrost-verify-{distro}-{type}-{stream}'
 
 # -------------------------------
 # VM defaults
@@ -67,7 +57,7 @@
 # job templates
 # -------------------------------
 - job-template:
-    name: '{project}-bifrost-verify-{distro}-{type}-{stream}'
+    name: 'openstack-bifrost-verify-{distro}-{type}-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -80,19 +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
-          default: '{project}'
       - string:
           name: PROJECT_REPO
-          default: '{project-repo}'
-      - string:
-          name: CLONE_LOCATION
-          default: '{clone-location}'
+          default: 'https://git.openstack.org/openstack/bifrost'
       - string:
           name: DISTRO
           default: '{distro}'
@@ -134,14 +127,9 @@
           default: 'true'
       - label:
           name: SLAVE_LABEL
-          default: 'infra-{type}-{distro}'
-      # yamllint disable rule:line-length
+          default: 'xci-virtual'
       - string:
-          name: BIFROST_LOG_URL
-          default: 'http://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER/$JOB_NAME'
-      # yamllint enable rule:line-length
-      - string:
-          name: XCI_LOOP
+          name: CI_LOOP
           default: 'verify'
 
     scm:
@@ -156,7 +144,7 @@
           wipe-workspace: true
 
     triggers:
-      - '{project}-gerrit-trigger':
+      - 'openstack-gerrit-trigger':
           branch: '{branch}'
 
     builders:
@@ -166,7 +154,7 @@
     wrappers:
       - fix-workspace-permissions
       - build-timeout:
-          timeout: 90
+          timeout: 180
 
     publishers:
       # yamllint disable rule:line-length
@@ -190,8 +178,8 @@
                 exclude-no-code-change: 'false'
             - comment-added-contains-event:
                 comment-contains-value: 'recheck'
-          custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
           silent-start: true
+          custom-url: '* $JOB_NAME $BUILD_URL'
           projects:
             - project-compare-type: 'PLAIN'
               project-pattern: 'openstack/bifrost'
@@ -206,33 +194,6 @@
                   pattern: 'releasenotes/**'
           readable-message: true
 
-- trigger:
-    name: 'opnfv-gerrit-trigger'
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'releng-xci'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'bifrost/**'
-          readable-message: true
-
 # --------------------------
 # builder macros
 # --------------------------