From fb4cea6d01b75de56c7678792c9c78dc21c96ec0 Mon Sep 17 00:00:00 2001
From: MatthewLi <matthew.lijun@huawei.com>
Date: Thu, 13 Jul 2017 02:54:40 -0400
Subject: [PATCH] dovetail: proposed_test run against apex

JIRA: DOVETAIL-359

1)run againt scenarios:
os-nosdn-nofeature-ha os-nosdn-kvm-ha   os-odl_l3-fdio-ha
2)stream: master
3)details see
https://wiki.opnfv.org/display/dovetail/Running+history+for+the+dovetail+tool

Change-Id: Ief6f85faa955b59c2229a5fdffd73f83480fc214
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
---
 jjb/apex/apex.yml                 | 14 ++++++++++++++
 jjb/apex/apex.yml.j2              | 14 ++++++++++++++
 jjb/dovetail/dovetail-ci-jobs.yml | 19 ++++++++++++++-----
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 2b69d59c2..0123d755a 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -584,6 +584,7 @@
                 - 'apex-deploy.*'
                 - 'functest.*'
                 - 'yardstick.*'
+                - 'dovetail.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -729,6 +730,19 @@
                   kill-phase-on: NEVER
                   abort-all-job: false
                   git-revision: false
+        - multijob:
+            name: Dovetail
+            condition: ALWAYS
+            projects:
+                - name: 'dovetail-apex-baremetal-proposed_tests-{scenario_stream}'
+                  node-parameters: true
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                  kill-phase-on: NEVER
+                  enable-condition: "DEPLOY_SCENARIO =~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
+                  abort-all-job: false
+                  git-revision: false
         - conditional-step:
             condition-kind: current-status
             condition-worst: SUCCESS
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 06cc2ca2e..7466a8301 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -528,6 +528,7 @@
                 - 'apex-deploy.*'
                 - 'functest.*'
                 - 'yardstick.*'
+                - 'dovetail.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -673,6 +674,19 @@
                   kill-phase-on: NEVER
                   abort-all-job: false
                   git-revision: false
+        - multijob:
+            name: Dovetail
+            condition: ALWAYS
+            projects:
+                - name: 'dovetail-apex-baremetal-proposed_tests-{scenario_stream}'
+                  node-parameters: true
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                  kill-phase-on: NEVER
+                  enable-condition: "DEPLOY_SCENARIO =~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
+                  abort-all-job: false
+                  git-revision: false
         - conditional-step:
             condition-kind: current-status
             condition-worst: SUCCESS
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 43978f6dc..8f05d59ed 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -88,13 +88,23 @@
 # that have not been switched using labels for slaves
 #--------------------------------
 #apex PODs
-        - lf-pod1:
-            slave-label: '{pod}'
+        - virtual:
+            slave-label: apex-virtual-master
             SUT: apex
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
-        - lf-pod1:
-            slave-label: '{pod}'
+        - baremetal:
+            slave-label: apex-baremetal-master
+            SUT: apex
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - virtual:
+            slave-label: apex-virtual-danube
+            SUT: apex
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *danube
+        - baremetal:
+            slave-label: apex-baremetal-danube
             SUT: apex
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *danube
@@ -169,7 +179,6 @@
             <<: *danube
 #--------------------------------
     testsuite:
-        - 'debug'
         - 'compliance_set'
         - 'proposed_tests'
 
-- 
2.16.6