Merge "remove scenarios"

[releng.git] / jjb / dovetail / dovetail-ci-jobs.yml

diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index b65e6d5..43978f6 100644 (file)
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -25,7 +25,7 @@
         branch: 'stable/{stream}'
         dovetail-branch: master
         gs-pathname: '/{stream}'
-        docker-tag: 'latest'
+        docker-tag: 'cvp.0.2.0'
 
 #-----------------------------------
 # POD, PLATFORM, AND BRANCH MAPPING
@@ -137,11 +137,41 @@
             SUT: fuel
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
+        - arm-virtual1:
+            slave-label: '{pod}'
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - zte-pod1:
+            slave-label: zte-pod1
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - zte-pod2:
+            slave-label: zte-pod2
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - zte-pod3:
+            slave-label: zte-pod3
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - zte-pod1:
+            slave-label: zte-pod1
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *danube
+        - zte-pod3:
+            slave-label: zte-pod3
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *danube
 #--------------------------------
     testsuite:
         - 'debug'
-        - 'proposed_tests'
         - 'compliance_set'
+        - 'proposed_tests'
 
     jobs:
         - 'dovetail-{SUT}-{pod}-{testsuite}-{stream}'
@@ -169,6 +199,7 @@
         - timeout:
             timeout: 180
             abort: true
+        - fix-workspace-permissions
 
     triggers:
         - '{auto-trigger-name}'
@@ -198,6 +229,10 @@
             name: DOVETAIL_REPO_DIR
             default: "/home/opnfv/dovetail"
             description: "Directory where the dovetail repository is cloned"
+        - string:
+            name: SUT_BRANCH
+            default: '{branch}'
+            description: "SUT branch"
 
     scm:
         - git-scm
@@ -208,9 +243,6 @@
         - 'dovetail-cleanup'
         - 'dovetail-run'
 
-    wrappers:
-        - fix-workspace-permissions
-
     publishers:
         - archive:
             artifacts: 'results/**/*'