Merge "jjb: xci: xci-start-new-vm: Create scenario overrides file"

[releng.git] / jjb / compass4nfv / compass-ci-jobs.yml

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 0d5f92c..8eeaabf 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -162,8 +162,6 @@
           block-level: 'NODE'
 
     wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
       - fix-workspace-permissions
 
     parameters:
@@ -174,7 +172,6 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
-          scenario: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
@@ -276,7 +273,7 @@
               label: '{scenario}'
           steps:
             - trigger-builds:
-                - project: 'bottlenecks-compass-posca_stress_ping-{pod}-daily-{stream}'
+                - project: 'bottlenecks-compass-posca_factor_multistack_storage_parallel-{pod}-daily-{stream}'
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}
@@ -286,7 +283,7 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
-                - project: 'bottlenecks-compass-posca_factor_multistack_storage_parallel-{pod}-daily-{stream}'
+                - project: 'bottlenecks-compass-posca_factor_soak_throughputs-{pod}-daily-{stream}'
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}
@@ -296,7 +293,7 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
-                - project: 'bottlenecks-compass-posca_factor_soak_throughputs-{pod}-daily-{stream}'
+                - project: 'bottlenecks-compass-posca_stress_ping-{pod}-daily-{stream}'
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}
@@ -362,7 +359,6 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
-          scenario: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
@@ -409,10 +405,10 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
-          scenario: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
+
     scm:
       - git-scm
 
@@ -457,7 +453,7 @@
           description: "Directory where the logs will be located upon the completion of the collection."
       - string:
           name: DEPLOY_SCENARIO
-          default: '{scenario}'
+          default: 'os-nosdn-nofeature-ha'
           description: "Scenario to deploy with."
       - string:
           name: COMPASS_OS_VERSION
@@ -790,7 +786,7 @@
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-fraser-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 5 1-29/2 * *'
 - trigger:
     name: 'compass-os-odl-sfc-ha-baremetal-fraser-trigger'
     triggers:
@@ -802,7 +798,7 @@
 - trigger:
     name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 7 2-30/2 * *'
 
 # ---------------------
 # noha-baremetal-fraser