Merge "Rename onap-oom-nofeature scenario to onap-nofeature-noha"

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-periodic-scenario.yaml

diff --git a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
index 1aa58565368dee39035834a41e06b09b96fdcf5d..a5e66f27ea5cb16e6799814c72a348659237ff8f 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
@@ -64,6 +64,8 @@
           installer-type: kubespray
       - k8-multus-nofeature:
           installer-type: kubespray
+      - os-nosdn-nofeature:
+          installer-type: kolla
 
     type:
       - baremetal:
@@ -72,9 +74,9 @@
 
     phase:
       - deploy:
-          build-timeout: 60
+          build-timeout: 90
       - functest:
-          build-timeout: 120
+          build-timeout: 135
       - yardstick:
           build-timeout: 30
       - promote:
@@ -142,6 +144,7 @@
           blocking-jobs:
             - 'cloud-infra-periodic-engine-.*'
             - 'k8-.*'
+            - 'os-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -150,7 +153,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 210
+          timeout: 245
       - fix-workspace-permissions
 
     scm:
@@ -158,6 +161,8 @@
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: ''
+          wipe_workspace: true
+          clean_before: false
 
     triggers:
       - timed: '@daily'
@@ -302,6 +307,8 @@
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: ''
+          wipe_workspace: true
+          clean_before: false
 
     builders:
       - description-setter: