X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-engine.yaml;h=6fbdd92c361e5afbc7b68805521ea6cb083d0463;hb=e504a2d79476433c3ebc3a84034f81fd56c6b291;hp=cbd866eda8b64779eb02f3a8cf8ed0928815717a;hpb=aaf958440c8721300e03ed5e6b88d488b6e63fad;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index cbd866ed..6fbdd92c 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -62,13 +62,20 @@
     type:
       - virtual:
           slave-label: 'vpod-deploy-city'
+          yardstick-dispatcher: 'file'
+          build-trigger: 'H H/3 * * *'
       - baremetal:
           slave-label: 'baremetal-deploy'
+          yardstick-dispatcher: 'influxdb'
+          build-trigger: '@daily'
 
     phase:
-      - deploy
-      - functest
-      - yardstick
+      - deploy:
+          build-timeout: 60
+      - functest:
+          build-timeout: 120
+      - yardstick:
+          build-timeout: 30
 
     jobs:
       - 'cloud-infra-periodic-engine-{os}-{type}-{stream}'
@@ -90,7 +97,7 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'vpod-deploy-city'
+          default: '{slave-label}'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
           name: DISTRIBUTION
@@ -116,14 +123,22 @@
           name: DIB_OS_ELEMENT
           default: '{dib_os_element}'
           description: 'DIB OS Element to use for building the deployment image to provision target nodes with'
+      - string:
+          name: INSTALLER_TYPE
+          default: 'kubespray'
+          description: 'Installer to use for deploying the scenario'
       - string:
           name: DEPLOY_SCENARIO
           default: 'k8-calico-nofeature'
           description: 'Scenario to deploy and test'
       - string:
           name: TEST_SUITE
-          default: 'healthcheck'
+          default: 'smoke'
           description: 'Test suite to run'
+      - string:
+          name: YARDSTICK_DISPATCHER
+          default: '{yardstick-dispatcher}'
+          description: 'Dispatcher to use for Yardstick reporting'
       - string:
           name: CLEANUP
           default: 'true'
@@ -135,6 +150,7 @@
           use-build-blocker: true
           blocking-jobs:
             - 'cloud-infra-verify-engine-{os}-.*'
+            - 'cloud-infra-verify-scenario-{os}-.*'
             - 'cloud-infra-periodic-engine-{os}-.*'
             - 'cloud-infra-os-.*'
             - 'cloud-infra-k8-.*'
@@ -146,7 +162,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 120
+          timeout: 210
       - fix-workspace-permissions
 
     scm:
@@ -156,7 +172,7 @@
           refspec: ''
 
     triggers:
-      - timed: 'H H/2 * * *'
+      - timed: '{build-trigger}'
 
     builders:
       - multijob:
@@ -172,6 +188,7 @@
                 IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
                 DIB_OS_RELEASE=$DIB_OS_RELEASE
                 DIB_OS_ELEMENT=$DIB_OS_ELEMENT
+                INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 CLEANUP=$CLEANUP
               git-revision: true
@@ -187,8 +204,10 @@
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
                 DEPLOY_TYPE=$DEPLOY_TYPE
+                INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
+                YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
                 CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
@@ -202,8 +221,10 @@
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
                 DEPLOY_TYPE=$DEPLOY_TYPE
+                INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
+                YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
                 CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
@@ -251,6 +272,10 @@
           name: ENGINE_ANSIBLE_PARAMS
           default: ' -v '
           description: 'Extra paramters that can be added when run the play books.'
+      - string:
+          name: INSTALLER_TYPE
+          default: 'kubespray'
+          description: 'Installer to use for deploying the scenario'
       - string:
           name: DEPLOY_SCENARIO
           default: 'k8-calico-nofeature'
@@ -261,19 +286,23 @@
           description: 'Test framework to use'
       - string:
           name: TEST_SUITE
-          default: 'healthcheck'
+          default: 'smoke'
           description: 'Test suite to run'
       - string:
           name: TEST_REPO_URL
           default: 'https://gerrit.nordix.org/infra/test.git'
           description: 'URL to Nordix Cloud Infra test repository'
+      - string:
+          name: YARDSTICK_DISPATCHER
+          default: 'file'
+          description: 'Dispatcher to use for Yardstick reporting'
       - string:
           name: CLEANUP
           default: 'false'
 
     wrappers:
       - build-timeout:
-          timeout: 120
+          timeout: '{build-timeout}'
       - fix-workspace-permissions
 
     scm: