diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-18 09:58:46 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-18 09:59:27 +0100 |
| commit | d6297d731df4ee327e91cb523b8dd1395098043d (patch) | |
| tree | 2a5da26a818c2c00092ac1c81e95f89159d91452 /jjb | |
| parent | 6a55a8b1fb286d169c272dedc763358e0a0a7922 (diff) | |
joid: Move multijob to build node and get rid of duplicated parameter
Change-Id: I358b496ce64ca7969b3675f7943bf3f412860c17
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
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)' |