X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-daily-jobs.yml;h=8de092d2993905da16f7e90ce0767c1949f2a8dc;hb=dcc6f4c792f88578a248d417d5d78b5603d826f7;hp=5984b3674ef38aaab7df144896fb0af99b2dee0c;hpb=2093734a5e12c8b64f174b6f7271c8e9aaf1e882;p=releng.git

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 5984b3674..8de092d29 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -80,22 +80,22 @@
             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}'
-#            installer: apex
-#            <<: *danube
-#        - apex-daily-danube:
-#            slave-label: '{pod}'
-#            installer: apex
-#            <<: *danube
+        - virtual:
+            slave-label: apex-virtual-danube
+            installer: apex
+            <<: *danube
+        - baremetal:
+            slave-label: apex-baremetal-danube
+            installer: apex
+            <<: *danube
 # armband CI PODs
         - armband-baremetal:
             slave-label: armband-baremetal
@@ -158,6 +158,14 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *master
+        - arm-pod4:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *master
+        - arm-virtual1:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *master
         - zte-pod1:
             slave-label: '{pod}'
             installer: fuel
@@ -186,6 +194,14 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *danube
+        - arm-pod4:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *danube
+        - arm-virtual1:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *danube
 # PODs for verify jobs triggered by each patch upload
         - ool-virtual1:
             slave-label: '{pod}'
@@ -197,7 +213,7 @@
         - 'suite':
             job-timeout: 60
         - 'daily':
-            job-timeout: 180
+            job-timeout: 240
 
     jobs:
         - 'functest-{installer}-{pod}-{testsuite}-{stream}'
@@ -286,6 +302,7 @@
                 - 'vims'
                 - 'multisite'
                 - 'parser'
+                - 'opera_vims'
         - string:
             name: TESTCASE_OPTIONS
             default: ''
@@ -339,6 +356,8 @@
         - 'functest-cleanup'
         - 'set-functest-env'
         - 'functest-suite'
+        - 'functest-store-results'
+        - 'functest-exit'
 
 - builder:
     name: functest-daily
@@ -357,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