diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-18 09:16:19 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-18 09:16:19 +0100 |
| commit | 6a55a8b1fb286d169c272dedc763358e0a0a7922 (patch) | |
| tree | d4f64ec45675a38cd791efe0bdc3c5cfa81490b4 /jjb/fuel | |
| parent | 287b69a6aa1e951e2daad44532a023bf843c1ab2 (diff) | |
fuel: Move multijob to build node and add additional scenarios
Change-Id: I5975cfe04481fcc58a3ee6b9f7182cf442b83318
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/fuel')
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 9caf3d183..e99981454 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -41,21 +41,31 @@ # new scenario descriptions scenario: - - 'os-nosdn-kvm-ha': + - 'os-odl_l2-nofeature-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' + - 'os-odl_l3-nofeature-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - - 'os-nosdn-kvm_ovs-ha': + - 'os-onos-nofeature-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-nofeature-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-nosdn-kvm-ha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-nosdn-kvm_ovs-ha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-ovs-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-vlan-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' - - 'os-odl_l2-nofeature-ha': - auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' - - 'os-odl_l3-nofeature-ha': + - 'os-odl_l2-nofeature-noha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - - 'os-onos-nofeature-ha': + - 'os-odl_l3-nofeature-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-onos-nofeature-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-nosdn-nofeature-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-odl_l2-bgpvpn-noha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' jobs: @@ -63,13 +73,15 @@ - 'fuel-deploy-{pod}-daily-{stream}' ######################## -# job templates - old type of defining the scenario +# job templates ######################## - job-template: name: 'fuel-{scenario}-{pod}-daily-{stream}' project-type: multijob + node: intel-build + concurrent: false properties: @@ -92,7 +104,6 @@ parameters: - project-parameter: project: '{project}' - - '{pod}-defaults' - '{installer}-defaults' - string: name: DEPLOY_SCENARIO @@ -106,21 +117,24 @@ condition: SUCCESSFUL projects: - name: 'fuel-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-fuel-{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-fuel-{pod}-daily-{stream}' - current-parameters: true + current-parameters: false + predefined-parameters: 'DEPLOY_SCENARIO={scenario}' kill-phase-on: NEVER - job-template: |