diff options
Diffstat (limited to 'jjb/fuel/fuel-ci-jobs.yml')
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 49 |
1 files changed, 38 insertions, 11 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 9caf3d183..50e45a41e 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -26,6 +26,8 @@ pod: - opnfv-jump-2: <<: *brahmaputra + - ericsson-pod1: + <<: *brahmaputra - virtual: <<: *brahmaputra #-------------------------------- @@ -41,21 +43,39 @@ # new scenario descriptions scenario: - - 'os-nosdn-kvm-ha': + # HA scenarios + - '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': + # NOHA scenarios + - '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-nosdn-kvm-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-nosdn-kvm_ovs-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-nosdn-ovs-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-odl_l2-bgpvpn-noha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' jobs: @@ -63,13 +83,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 +114,6 @@ parameters: - project-parameter: project: '{project}' - - '{pod}-defaults' - '{installer}-defaults' - string: name: DEPLOY_SCENARIO @@ -106,21 +127,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: @@ -143,6 +167,9 @@ project: '{project}' - '{pod}-defaults' - '{installer}-defaults' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' - fuel-ci-parameter: gs-pathname: '{gs-pathname}' |