X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-daily-jobs.yml;h=f14ca758f69de5ce02117b95edccdeb069376232;hb=95f267f263aa934c9d96d8cf373c625cdd183cb5;hp=80ca44b32155d3d752774bc67c43be62735c1656;hpb=a19708f290905bbb831e7430a1d9a984d5fb6e79;p=releng.git

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 80ca44b32..f14ca758f 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,7 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *master
-        - arm-pod3-2:
+        - arm-pod4:
             slave-label: '{pod}'
             installer: fuel
             <<: *master
@@ -194,7 +194,7 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *danube
-        - arm-pod3-2:
+        - arm-pod4:
             slave-label: '{pod}'
             installer: fuel
             <<: *danube
@@ -203,12 +203,22 @@
             installer: fuel
             <<: *danube
 # PODs for verify jobs triggered by each patch upload
-        - ool-virtual1:
-            slave-label: '{pod}'
-            installer: apex
-            <<: *master
+#        - ool-virtual1:
+#            slave-label: '{pod}'
+#            installer: apex
+#            <<: *master
 #--------------------------------
 
+    alpine-pod:
+        - ericsson-virtual-pod1bl01:
+            slave-label: '{alpine-pod}'
+            installer: fuel
+            <<: *master
+        - huawei-virtual5:
+            slave-label: '{alpine-pod}'
+            installer: compass
+            <<: *master
+
     testsuite:
         - 'suite':
             job-timeout: 60
@@ -217,6 +227,7 @@
 
     jobs:
         - 'functest-{installer}-{pod}-{testsuite}-{stream}'
+        - 'functest-alpine-{installer}-{alpine-pod}-{testsuite}-{stream}'
 
 ################################
 # job template
@@ -269,6 +280,46 @@
             description: "Built on $NODE_NAME"
         - 'functest-{testsuite}-builder'
 
+- job-template:
+    name: 'functest-alpine-{installer}-{alpine-pod}-{testsuite}-{stream}'
+
+    concurrent: true
+
+    properties:
+        - logrotate-default
+        - throttle:
+            enabled: true
+            max-per-node: 1
+            option: 'project'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: '{job-timeout}'
+            abort: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+        - '{installer}-defaults'
+        - '{slave-label}-defaults'
+        - 'functest-{testsuite}-parameter'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-nosdn-nofeature-noha'
+        - functest-parameter:
+            gs-pathname: '{gs-pathname}'
+
+    scm:
+        - git-scm
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - 'functest-alpine-daily-builder'
+
 ########################
 # parameter macros
 ########################
@@ -302,6 +353,7 @@
                 - 'vims'
                 - 'multisite'
                 - 'parser'
+                - 'opera_vims'
         - string:
             name: TESTCASE_OPTIONS
             default: ''
@@ -355,6 +407,17 @@
         - 'functest-cleanup'
         - 'set-functest-env'
         - 'functest-suite'
+        - 'functest-store-results'
+        - 'functest-exit'
+
+- builder:
+    name: functest-alpine-daily-builder
+    builders:
+        - shell:
+            !include-raw:
+                - ./functest-env-presetup.sh
+                - ../../utils/fetch_os_creds.sh
+                - ./functest-alpine.sh
 
 - builder:
     name: functest-daily
@@ -373,7 +436,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