X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-daily-jobs.yml;h=35b43e8cbc015bbc6c34dbe7a8a0cd551b733faa;hb=e21c70758705d45db40f5536f0b15db463b7e207;hp=bddb2777b101ebcabeea09e696768c9b1a64527c;hpb=2dab5a73f0ab1376d924559e2809be0bffe33103;p=releng.git

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index bddb2777b..35b43e8cb 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -14,12 +14,10 @@
       stream: master
       branch: '{stream}'
       gs-pathname: ''
-      docker-tag: 'latest'
     euphrates: &euphrates
       stream: euphrates
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
-      docker-tag: 'stable'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -183,6 +181,11 @@
           slave-label: '{pod}'
           installer: daisy
           <<: *euphrates
+      - zte-pod9:
+          slave-label: '{pod}'
+          installer: daisy
+          <<: *master
+    # -------------------------------
     # PODs for verify jobs triggered by each patch upload
     #   - ool-virtual1:
     #       slave-label: '{pod}'
@@ -190,33 +193,115 @@
     #       <<: *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
-      - 'daily':
+    functest-tier:
+      - 'healthcheck':
+          job-timeout: 20
+      - 'smoke':
+          job-timeout: 180
+      - 'components':
           job-timeout: 240
-      - 'arm-daily':
+      - 'patrole':
+          job-timeout: 20
+      - 'vnf':
           job-timeout: 240
+      - 'parser':
+          job-timeout: 20
+
+    features-suite:
+      - 'doctor-notification'
+      - 'promise'
+      - 'bgpvpn'
+      - 'functest-odl-sfc'
+      - 'domino-multinode'
+      - 'fds'
+      - 'barometercollectd'
+
+    exclude:
+      - features-suite: 'promise'
+        stream: 'master'
+      - features-suite: 'domino-multinode'
+        stream: 'master'
+      - features-suite: 'fds'
+        stream: 'euphrates'
+
+    build-job-settings: &build-job-settings
+      current-parameter: false
+      git-revision: true
+      node-parameters: false
+      kill-phase-on: FAILURE
+      abort-all-jobs: false
+      predefined-parameters: |
+        FUNCTEST_MODE=$FUNCTEST_MODE
+        FUNCTEST_TIER=$FUNCTEST_TIER
+
+    features-job-settings: &features-job-settings
+      current-parameter: false
+      git-revision: true
+      node-parameters: false
+      kill-phase-on: FAILURE
+      abort-all-jobs: false
+      predefined-parameters: |
+        FUNCTEST_MODE=$FUNCTEST_MODE
+        FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
 
     jobs:
-      - 'functest-{installer}-{pod}-{testsuite}-{stream}'
-      - 'functest-alpine-{installer}-{alpine-pod}-{testsuite}-{stream}'
-
+      - 'functest-{installer}-{pod}-suite-{stream}'
+      - 'functest-{installer}-{pod}-daily-{stream}'
+      - 'functest-{installer}-{pod}-daily-{functest-tier}-{stream}'
+      - 'functest-{installer}-{pod}-daily-features-{features-suite}-{stream}'
 ################################
 # job template
 ################################
 - job-template:
-    name: 'functest-{installer}-{pod}-{testsuite}-{stream}'
+
+    name: 'functest-{installer}-{pod}-daily-{stream}'
+
+    project-type: multijob
+
+    disabled: 'false'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{installer}-defaults'
+      - '{slave-label}-defaults'
+      - functest-parameter:
+          gs-pathname: '{gs-pathname}'
+
+    builders:
+      - multijob:
+          name: 'Run functest tests'
+          execution-type: SEQUENTIAL
+          projects:
+            - name: 'functest-{installer}-{pod}-daily-healthcheck-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-{installer}-{pod}-daily-smoke-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-{installer}-{pod}-daily-patrole-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-{installer}-{pod}-daily-vnf-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-{installer}-{pod}-daily-features-doctor-notification-{stream}'
+              <<: *features-job-settings
+            - name: 'functest-{installer}-{pod}-daily-features-bgpvpn-{stream}'
+              <<: *features-job-settings
+            - name: 'functest-{installer}-{pod}-daily-features-functest-odl-sfc-{stream}'
+              <<: *features-job-settings
+            - name: 'functest-{installer}-{pod}-daily-features-barometercollectd-{stream}'
+              <<: *features-job-settings
+            - name: 'functest-{installer}-{pod}-daily-features-fds-{stream}'
+              <<: *features-job-settings
+            - name: 'functest-{installer}-{pod}-daily-features-promise-{stream}'
+              <<: *features-job-settings
+            - name: 'functest-{installer}-{pod}-daily-features-domino-multinode-{stream}'
+              <<: *features-job-settings
+            - name: 'functest-{installer}-{pod}-daily-parser-{stream}'
+              <<: *build-job-settings
+
+- job-template: &functest-installer-tier-job
+
+    name: 'functest-{installer}-{pod}-daily-{functest-tier}-{stream}'
 
     concurrent: true
 
@@ -240,14 +325,15 @@
           branch: '{branch}'
       - '{installer}-defaults'
       - '{slave-label}-defaults'
-      - 'functest-{testsuite}-parameter'
       - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-odl_l2-nofeature-ha'
+          name: FUNCTEST_MODE
+          default: 'tier'
       - string:
-          name: DOCKER_TAG
-          default: '{docker-tag}'
-          description: 'Tag to pull docker image'
+          name: FUNCTEST_TIER
+          default: '{functest-tier}'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-nosdn-nofeature-noha'
       - string:
           name: CLEAN_DOCKER_IMAGES
           default: 'false'
@@ -261,26 +347,58 @@
     builders:
       - description-setter:
           description: "Built on $NODE_NAME"
-      - 'functest-{testsuite}-builder'
+      - 'functest-daily-builder'
+
+    publishers:
+      - 'functest-recipients'
+      - 'fuel-recipients'
 
 - job-template:
-    name: 'functest-alpine-{installer}-{alpine-pod}-{testsuite}-{stream}'
 
-    concurrent: true
+    name: 'functest-{installer}-{pod}-suite-{stream}'
+    <<: *functest-installer-tier-job
+
+    wrappers:
+      - build-name:
+          name: '$BUILD_NUMBER Suite: $FUNCTEST_MODE Scenario: $DEPLOY_SCENARIO'
+      - timeout:
+          timeout: '60'
+          abort: true
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{installer}-defaults'
+      - '{slave-label}-defaults'
+      - 'functest-suite-parameter'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-nosdn-nofeature-noha'
+      - string:
+          name: CLEAN_DOCKER_IMAGES
+          default: 'false'
+          description: 'Remove downloaded docker images (opnfv/functest*:*)'
+      - functest-parameter:
+          gs-pathname: '{gs-pathname}'
+
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - 'functest-suite-builder'
+
+- job-template:
 
+    name: 'functest-{installer}-{pod}-daily-features-{features-suite}-{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
+          name: '$BUILD_NUMBER Suite: $FUNCTEST_MODE Scenario: $DEPLOY_SCENARIO'
 
     parameters:
       - project-parameter:
@@ -288,10 +406,19 @@
           branch: '{branch}'
       - '{installer}-defaults'
       - '{slave-label}-defaults'
-      - 'functest-{testsuite}-parameter'
+      - string:
+          name: FUNCTEST_MODE
+          default: 'testcase'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: '{features-suite}'
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-nosdn-nofeature-noha'
+      - string:
+          name: CLEAN_DOCKER_IMAGES
+          default: 'false'
+          description: 'Remove downloaded docker images (opnfv/functest*:*)'
       - functest-parameter:
           gs-pathname: '{gs-pathname}'
 
@@ -301,7 +428,13 @@
     builders:
       - description-setter:
           description: "Built on $NODE_NAME"
-      - 'functest-alpine-daily-builder'
+      - 'functest-daily-builder'
+
+    publishers:
+      - 'functest-features-recipients'
+      - 'functest-recipients'
+      - 'fuel-recipients'
+
 
 ########################
 # parameter macros
@@ -314,14 +447,6 @@
           default: 'daily'
           description: "Daily suite name to run"
 
-- parameter:
-    name: functest-arm-daily-parameter
-    parameters:
-      - string:
-          name: FUNCTEST_MODE
-          default: 'arm-daily'
-          description: "Daily suite name (Aarch64) to run"
-
 - parameter:
     name: functest-suite-parameter
     parameters:
@@ -346,6 +471,7 @@
             - 'odl_netvirt'
             - 'snaps_smoke'
             - 'refstack_defcore'
+            - 'patrole'
             - 'promise'
             - 'doctor'
             - 'bgpvpn'
@@ -363,9 +489,11 @@
           choices:
             - 'healthcheck'
             - 'smoke'
+            - 'patrole'
             - 'features'
             - 'components'
             - 'vnf'
+            - 'parser'
           default: 'healthcheck'
       - string:
           name: TESTCASE_OPTIONS
@@ -414,29 +542,10 @@
       - 'functest-store-results'
       - 'functest-exit'
 
-- builder:
-    name: functest-arm-daily-builder
-    builders:
-      - 'functest-cleanup'
-      - 'set-functest-env'
-      - 'functest-arm-daily'
-      - 'functest-store-results'
-      - 'functest-exit'
-
 - builder:
     name: functest-suite-builder
     builders:
       - 'functest-cleanup'
-      - 'set-functest-env-alpine'
-      - 'functest-suite'
-      - 'functest-store-results'
-      - 'functest-exit'
-
-- builder:
-    name: functest-alpine-daily-builder
-    builders:
-      - 'functest-cleanup'
-      - 'set-functest-env-alpine'
       - 'functest-daily'
       - 'functest-store-results'
       - 'functest-exit'
@@ -445,47 +554,25 @@
     name: functest-daily
     builders:
       # yamllint disable rule:indentation
-      - shell:
-          !include-raw:
-              - ./functest-env-presetup.sh
-              - ../../utils/fetch_os_creds.sh
-              - ./functest-alpine.sh
-
-# yamllint enable rule:indentation
-- builder:
-    name: functest-arm-daily
-    builders:
-      - shell:
-          !include-raw: ./functest-loop.sh
-
-- builder:
-    name: functest-suite
-    builders:
-      # yamllint disable rule:indentation
-      - shell:
-          !include-raw:
-              - ./functest-alpine.sh
-
-# yamllint enable rule:indentation
-- builder:
-    name: set-functest-env
-    builders:
-      # yamllint disable rule:indentation
-      - shell:
-          !include-raw:
-              - ./functest-env-presetup.sh
-              - ../../utils/fetch_os_creds.sh
-              - ./set-functest-env.sh
-
-# yamllint enable rule:indentation
-- builder:
-    name: set-functest-env-alpine
-    builders:
-      # yamllint disable rule:indentation
-      - shell:
-          !include-raw:
-              - ./functest-env-presetup.sh
-              - ../../utils/fetch_os_creds.sh
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "os-.*"
+          label: '$DEPLOY_SCENARIO'
+          steps:
+            - shell:
+                !include-raw:
+                    - ./functest-env-presetup.sh
+                    - ../../utils/fetch_os_creds.sh
+                    - ./functest-alpine.sh
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "k8-.*"
+          label: '$DEPLOY_SCENARIO'
+          steps:
+            - shell:
+                !include-raw:
+                    - ../../utils/fetch_k8_conf.sh
+                    - ./functest-k8.sh
 
 # yamllint enable rule:indentation
 - builder:
@@ -505,3 +592,30 @@
     builders:
       - shell:
           !include-raw: ./functest-exit.sh
+
+
+- publisher:
+    name: 'functest-features-recipients'
+    publishers:
+      - email:
+          recipients:
+
+- publisher:
+    name: 'functest-recipients'
+    publishers:
+      - email:
+          recipients: >
+            jalausuch@suse.com morgan.richomme@orange.com
+            cedric.ollivier@orange.com feng.xiaowei@zte.com.cn
+            juha.kosonen@nokia.com wangwulin@huawei.com
+            delia.popescu@enea.com cristina.pauna@enea.com
+            valentin.boucher@kontron.com
+      - email-jenkins-admins-on-failure
+
+- publisher:
+    name: 'fuel-recipients'
+    publishers:
+      - email:
+          recipients: >
+            peter.barabas@ericsson.com mpolenchuck@mirantis.com
+            alexandru.avadanii@enea.com guillermo.herrero@enea.com