Merge "Filter out added/modified *.ipynb for preview job"

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 4adfc2a..446d071 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -13,7 +13,7 @@
       gs-pathname: ''
       ppa-pathname: '/{stream}'
       disabled: false
-      openstack-version: ocata
+      openstack-version: pike
     euphrates: &euphrates
       stream: euphrates
       branch: 'stable/{stream}'

diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 6927145..9cdedfe 100644 (file)
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -16,13 +16,13 @@
           disabled: false
           openstack-version: 'ocata'
           branch-type: 'master'
-      - danube:
+      - euphrates:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           ppa-pathname: '/{stream}'
           disabled: false
-          openstack-version: 'newton'
-          branch-type: 'branch'
+          openstack-version: 'ocata'
+          branch-type: 'master'
 
     distro:
       - 'xenial':

diff --git a/jjb/qtip/qtip-experimental-jobs.yml b/jjb/qtip/qtip-experimental-jobs.yml
index db2fb8b..103069f 100644 (file)
--- a/jjb/qtip/qtip-experimental-jobs.yml
+++ b/jjb/qtip/qtip-experimental-jobs.yml
@@ -7,7 +7,7 @@
     name: qtip-experimental-jobs
     project: qtip
     jobs:
-      - 'qtip-experimental-{stream}'
+      - 'qtip-experimental-{pod}-{stream}'
     stream:
       - master:
           branch: '{stream}'
@@ -18,12 +18,17 @@
           gs-pathname: '/{stream}'
           disabled: false
 
+    pod:
+      - zte-virtual6:
+          installer: fuel
+          pod: zte-virtual6
+
 ################################
 ## job templates
 #################################
 
 - job-template:
-    name: 'qtip-experimental-{stream}'
+    name: 'qtip-experimental-{pod}-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -31,9 +36,8 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      # Pin the tests on zte-pod6 with MCP deployment
-      - fuel-defaults
-      - zte-virtual6-defaults
+      - '{installer}-defaults'
+      - '{pod}-defaults'
     scm:
       - git-scm-gerrit
 

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 93ca187..ca14cd9 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -195,8 +195,8 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'bifrost-verify-.*'
-            - 'bifrost-periodic-.*'
+            - '.*-bifrost-verify-.*'
+            - '.*-bifrost-periodic-.*'
             - 'osa-verify-.*'
             - 'osa-periodic-.*'
           block-level: 'NODE'