summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/joid/joid-ci-jobs.yml12
-rw-r--r--jjb/opnfv/installer-params.yml4
2 files changed, 7 insertions, 9 deletions
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index 8023d4ba6..bac8c6985 100644
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -95,9 +95,6 @@
project: '{project}'
- '{installer}-defaults'
- '{pod}-defaults'
- - string:
- name: DEPLOY_SCENARIO
- default: '{scenario}'
builders:
- multijob:
@@ -105,24 +102,21 @@
condition: SUCCESSFUL
projects:
- name: 'joid-deploy-{pod}-daily-{stream}'
- current-parameters: false
- predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
+ current-parameters: true
kill-phase-on: FAILURE
- multijob:
name: functest
condition: COMPLETED
projects:
- name: 'functest-joid-{pod}-daily-{stream}'
- current-parameters: false
- predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
+ current-parameters: true
kill-phase-on: NEVER
- multijob:
name: yardstick
condition: COMPLETED
projects:
- name: 'yardstick-joid-{pod}-daily-{stream}'
- current-parameters: false
- predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
+ current-parameters: true
kill-phase-on: NEVER
- job-template:
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 9dd3d5406..282ced5cc 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -89,3 +89,7 @@
name: MAAS_REINSTALL
default: 'false'
description: "Reinstall MAAS and Bootstrap before deploy [true/false]"
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-odl_l2-nofeature-ha'
+ description: "Scenario to deploy and test"