From: mei mei <meimei@huawei.com>
Date: Wed, 29 Aug 2018 01:23:57 +0000 (+0000)
Subject: Merge "Bottlenecks results dir has been changed"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=154d28f15e15a1700c95443c14bb4463f5fe69ec;hp=cea28ad9a7456e9e56a34c1257e4d734fc3a4fc0;p=releng.git

Merge "Bottlenecks results dir has been changed"
---

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index 7e15c303e..469023037 100644
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -99,15 +99,6 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
               git-revision: true
-            - name: 'doctor-verify-daisy-congress-x86_64-{stream}'
-              predefined-parameters: |
-                PROJECT=$PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              kill-phase-on: FAILURE
-              git-revision: true
 
 - job-template:
     name: 'doctor-verify-{installer}-{inspector}-{arch}-{stream}'
diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index 28c5aebb2..47bd83c8a 100644
--- a/jjb/xci/xci-daily-jobs.yaml
+++ b/jjb/xci/xci-daily-jobs.yaml
@@ -21,11 +21,56 @@
           deploy-scenario: 'os-nosdn-nofeature'
           installer-type: 'osa'
           xci-flavor: 'mini'
+      - 'os-nosdn-osm-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'os-nosdn-osm'
+          installer-type: 'osa'
+          xci-flavor: 'mini'
+      - 'os-odl-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'os-odl-nofeature'
+          installer-type: 'osa'
+          xci-flavor: 'mini'
+      - 'os-odl-bgpvpn-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'os-odl-bgpvpn'
+          installer-type: 'osa'
+          xci-flavor: 'mini'
       - 'os-odl-sfc-noha':
           auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'os-odl-sfc'
           installer-type: 'osa'
           xci-flavor: 'mini'
+      - 'k8-nosdn-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'k8-nosdn-nofeature'
+          installer-type: 'kubespray'
+          xci-flavor: 'mini'
+      - 'k8-canal-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'k8-canal-nofeature'
+          installer-type: 'kubespray'
+          xci-flavor: 'mini'
+      - 'k8-calico-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'k8-calico-nofeature'
+          installer-type: 'kubespray'
+          xci-flavor: 'mini'
+      - 'k8-contiv-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'k8-contiv-nofeature'
+          installer-type: 'kubespray'
+          xci-flavor: 'mini'
+      - 'k8-flannel-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'k8-flannel-nofeature'
+          installer-type: 'kubespray'
+          xci-flavor: 'mini'
+      - 'k8-nosdn-istio-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'k8-nosdn-istio'
+          installer-type: 'kubespray'
+          xci-flavor: 'mini'
 
     # -------------------------------
     # XCI PODs
@@ -79,6 +124,7 @@
             - '^xci-verify.*'
             - '^xci-merge.*'
             - '^xci-os.*'
+            - '^xci-k8.*'
             - '^xci-deploy.*'
             - '^xci-functest.*'
             - '^bifrost-.*periodic.*'
diff --git a/jjb/xci/xci-merge-jobs.yaml b/jjb/xci/xci-merge-jobs.yaml
index bdb6d5617..0cf1ab9e5 100644
--- a/jjb/xci/xci-merge-jobs.yaml
+++ b/jjb/xci/xci-merge-jobs.yaml
@@ -224,6 +224,7 @@
             - 'xci-verify-{distro}-.*'
             - 'xci-merge-{distro}-.*'
             - 'xci-os.*'
+            - 'xci-k8.*'
             - 'openstack-bifrost-verify-{distro}-.*'
             - 'xci-osa-verify-{distro}-.*'
             - 'xci-osa-periodic-{distro}-.*'
diff --git a/jjb/xci/xci-verify-jobs.yaml b/jjb/xci/xci-verify-jobs.yaml
index 9ee41db1b..cc6de488f 100644
--- a/jjb/xci/xci-verify-jobs.yaml
+++ b/jjb/xci/xci-verify-jobs.yaml
@@ -68,6 +68,7 @@
             - 'xci-verify-{distro}-.*'
             - 'xci-merge-{distro}-.*'
             - 'xci-os-.*'
+            - 'xci-k8-.*'
             - 'openstack-bifrost-verify-{distro}-.*'
             - 'xci-osa-verify-{distro}-.*'
             - 'xci-osa-periodic-{distro}-.*'