X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-daily-jobs.yml;h=099d01a59926a457133048f12bf2e4b153cdde8e;hb=339d2569a5eb42487414d170f3823e868bc6c464;hp=bddb2777b101ebcabeea09e696768c9b1a64527c;hpb=6ebcae56c76492c4cdf42141a7b60bae1991e6f3;p=releng.git

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index bddb2777b..099d01a59 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,27 +193,16 @@
     #       <<: *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':
-          job-timeout: 240
+          job-timeout: 300
       - 'arm-daily':
-          job-timeout: 240
+          job-timeout: 300
 
     jobs:
       - 'functest-{installer}-{pod}-{testsuite}-{stream}'
-      - 'functest-alpine-{installer}-{alpine-pod}-{testsuite}-{stream}'
 
 ################################
 # job template
@@ -244,10 +236,6 @@
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-odl_l2-nofeature-ha'
-      - string:
-          name: DOCKER_TAG
-          default: '{docker-tag}'
-          description: 'Tag to pull docker image'
       - string:
           name: CLEAN_DOCKER_IMAGES
           default: 'false'
@@ -263,45 +251,6 @@
           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
@@ -418,7 +367,6 @@
     name: functest-arm-daily-builder
     builders:
       - 'functest-cleanup'
-      - 'set-functest-env'
       - 'functest-arm-daily'
       - 'functest-store-results'
       - 'functest-exit'
@@ -427,16 +375,6 @@
     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 +383,36 @@
     name: functest-daily
     builders:
       # yamllint disable rule:indentation
-      - shell:
-          !include-raw:
-              - ./functest-env-presetup.sh
-              - ../../utils/fetch_os_creds.sh
-              - ./functest-alpine.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:
     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
+              - ./functest-alpine.sh
 
 # yamllint enable rule:indentation
 - builder: