diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2016-01-18 20:23:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-18 20:23:19 +0000 |
| commit | 628582a9d06826a8a2cf164ca3560f5e71225c5c (patch) | |
| tree | 87117faf4afb05d5f644f2a2532497069cbe7792 /jjb | |
| parent | 659810f6d6845f0a2dfc2ba9a67ab6b641146541 (diff) | |
| parent | d6297d731df4ee327e91cb523b8dd1395098043d (diff) | |
Merge "joid: Move multijob to build node and get rid of duplicated parameter"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 11 | ||||
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index 12a49f314..8023d4ba6 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -69,6 +69,8 @@ project-type: multijob + node: intel-build + concurrent: false properties: @@ -103,21 +105,24 @@ condition: SUCCESSFUL projects: - name: 'joid-deploy-{pod}-daily-{stream}' - current-parameters: true + current-parameters: false + predefined-parameters: 'DEPLOY_SCENARIO={scenario}' kill-phase-on: FAILURE - multijob: name: functest condition: COMPLETED projects: - name: 'functest-joid-{pod}-daily-{stream}' - current-parameters: true + current-parameters: false + predefined-parameters: 'DEPLOY_SCENARIO={scenario}' kill-phase-on: NEVER - multijob: name: yardstick condition: COMPLETED projects: - name: 'yardstick-joid-{pod}-daily-{stream}' - current-parameters: true + current-parameters: false + predefined-parameters: 'DEPLOY_SCENARIO={scenario}' kill-phase-on: NEVER - job-template: diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index 986ecc081..9dd3d5406 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -62,10 +62,6 @@ default: joid description: 'Installer used for deploying OPNFV on this POD' - string: - name: DEPLOY_SCENARIO - default: 'none' - description: 'Scenario to deploy and test' - - string: name: OS_RELEASE default: 'liberty' description: 'OpenStack release (kilo|liberty)' |