summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/apex/apex.yml25
-rw-r--r--jjb/apex/apex.yml.j225
2 files changed, 26 insertions, 24 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index b33c78e0c..aeea1c9fb 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -797,18 +797,19 @@
enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
abort-all-job: false
git-revision: false
-# - multijob:
-# name: StorPerf
-# condition: ALWAYS
-# projects:
-# - name: 'storperf-apex-baremetal-daily-{scenario_stream}'
-# node-parameters: true
-# current-parameters: false
-# predefined-parameters:
-# DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-# kill-phase-on: NEVER
-# abort-all-job: false
-# git-revision: false
+ - multijob:
+ name: StorPerf
+ condition: ALWAYS
+ projects:
+ - name: 'storperf-apex-baremetal-daily-{scenario_stream}'
+ node-parameters: true
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-nosdn-nofeature-ha/"
+ kill-phase-on: NEVER
+ abort-all-job: false
+ git-revision: false
# Build status is always success due conditional plugin prefetching
# build status before multijob phases execute
# - conditional-step:
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 499e42656..0d446dcd7 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -709,18 +709,19 @@
enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
abort-all-job: false
git-revision: false
-# - multijob:
-# name: StorPerf
-# condition: ALWAYS
-# projects:
-# - name: 'storperf-apex-baremetal-daily-{scenario_stream}'
-# node-parameters: true
-# current-parameters: false
-# predefined-parameters:
-# DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-# kill-phase-on: NEVER
-# abort-all-job: false
-# git-revision: false
+ - multijob:
+ name: StorPerf
+ condition: ALWAYS
+ projects:
+ - name: 'storperf-apex-baremetal-daily-{scenario_stream}'
+ node-parameters: true
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-nosdn-nofeature-ha/"
+ kill-phase-on: NEVER
+ abort-all-job: false
+ git-revision: false
# Build status is always success due conditional plugin prefetching
# build status before multijob phases execute
# - conditional-step: