X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-daily-jobs.yml;h=fdef6f483c1d692b21a5daffd22d4989fc5fa278;hb=f05755626655aa5532650823f869b513d4b5cd45;hp=a3268d3e5da8e0cbd2a903e3bcd284e292533a06;hpb=9998d012e141763b76c1c847a4f16a01ac610ada;p=releng.git

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index a3268d3e5..fdef6f483 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -80,20 +80,20 @@
             installer: compass
             <<: *danube
 # apex CI PODs
-        - apex-verify-master:
-            slave-label: '{pod}'
+        - virtual:
+            slave-label: apex-virtual-master
             installer: apex
             <<: *master
-        - apex-daily-master:
-            slave-label: '{pod}'
+        - baremetal:
+            slave-label: apex-baremetal-master
             installer: apex
             <<: *master
-        - apex-verify-danube:
-            slave-label: '{pod}'
+        - virtual:
+            slave-label: apex-virtual-danube
             installer: apex
             <<: *danube
-        - apex-daily-danube:
-            slave-label: '{pod}'
+        - baremetal:
+            slave-label: apex-baremetal-danube
             installer: apex
             <<: *danube
 # armband CI PODs
@@ -158,7 +158,11 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *master
-        - arm-pod3-2:
+        - arm-pod4:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *master
+        - arm-virtual1:
             slave-label: '{pod}'
             installer: fuel
             <<: *master
@@ -190,22 +194,26 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *danube
-        - arm-pod3-2:
+        - arm-pod4:
             slave-label: '{pod}'
             installer: fuel
             <<: *danube
-# PODs for verify jobs triggered by each patch upload
-        - ool-virtual1:
+        - arm-virtual1:
             slave-label: '{pod}'
-            installer: apex
-            <<: *master
+            installer: fuel
+            <<: *danube
+# PODs for verify jobs triggered by each patch upload
+#        - ool-virtual1:
+#            slave-label: '{pod}'
+#            installer: apex
+#            <<: *master
 #--------------------------------
 
     testsuite:
         - 'suite':
             job-timeout: 60
         - 'daily':
-            job-timeout: 180
+            job-timeout: 240
 
     jobs:
         - 'functest-{installer}-{pod}-{testsuite}-{stream}'
@@ -294,6 +302,7 @@
                 - 'vims'
                 - 'multisite'
                 - 'parser'
+                - 'opera_vims'
         - string:
             name: TESTCASE_OPTIONS
             default: ''
@@ -347,6 +356,8 @@
         - 'functest-cleanup'
         - 'set-functest-env'
         - 'functest-suite'
+        - 'functest-store-results'
+        - 'functest-exit'
 
 - builder:
     name: functest-daily
@@ -365,7 +376,10 @@
     name: set-functest-env
     builders:
         - shell:
-            !include-raw: ./set-functest-env.sh
+            !include-raw:
+                - ./functest-env-presetup.sh
+                - ../../utils/fetch_os_creds.sh
+                - ./set-functest-env.sh
 
 - builder:
     name: functest-store-results