diff options
Diffstat (limited to 'jjb/joid/joid-ci-jobs.yml')
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 74 |
1 files changed, 44 insertions, 30 deletions
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index 9bb3265f2..849112319 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -28,6 +28,8 @@ pod: - intel-pod5: <<: *brahmaputra + - virtual: + <<: *brahmaputra #-------------------------------- # master #-------------------------------- @@ -37,6 +39,8 @@ <<: *master - juniper-pod1: <<: *master + - virtual: + <<: *master #-------------------------------- # new scenario descriptions scenario: @@ -67,10 +71,6 @@ - job-template: name: 'joid-{scenario}-{pod}-daily-{stream}' - project-type: multijob - - node: intel-build - concurrent: false properties: @@ -94,35 +94,42 @@ - project-parameter: project: '{project}' - '{installer}-defaults' + - '{pod}-defaults': + installer: '{installer}' - string: name: DEPLOY_SCENARIO default: '{scenario}' builders: - - multijob: - name: deploy - condition: SUCCESSFUL - projects: - - name: 'joid-deploy-{pod}-daily-{stream}' - 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: false - predefined-parameters: 'DEPLOY_SCENARIO={scenario}' - kill-phase-on: NEVER - - multijob: - name: yardstick - condition: COMPLETED - projects: - - name: 'yardstick-joid-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: 'DEPLOY_SCENARIO={scenario}' - kill-phase-on: NEVER + - trigger-builds: + - project: 'joid-deploy-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + - trigger-builds: + - project: 'functest-joid-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-joid-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - job-template: name: 'joid-deploy-{pod}-daily-{stream}' @@ -150,7 +157,11 @@ - project-parameter: project: '{project}' - '{installer}-defaults' - - '{pod}-defaults' + - '{pod}-defaults': + installer: '{installer}' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' scm: - git-scm: @@ -160,7 +171,6 @@ builders: - 'builder-macro' - ######################## # builder macros ######################## @@ -196,3 +206,7 @@ name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-trigger' triggers: - timed: '' +- trigger: + name: 'joid-os-odl_l2-nofeature-ha-virtual-trigger' + triggers: + - timed: '' |