diff options
Diffstat (limited to 'jjb/joid/joid-ci-jobs.yml')
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 93 |
1 files changed, 50 insertions, 43 deletions
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index 05064de1f..12a49f314 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -35,41 +35,58 @@ <<: *master - orange-pod2: <<: *master + - juniper-pod1: + <<: *master #-------------------------------- -# please check the triggers before enabling any of the controllers!!! - sdn-controller: - - 'odl': - disabled: false -# commented out below controllers to get Arno scenario settled first -# - 'nosdn': -# disabled: true - - 'onos': - disabled: false -# - 'opencontrail': -# disabled: true +# new scenario descriptions + scenario: + - 'os-nosdn-nofeature-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-nosdn-nofeature-ha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-odl_l2-nofeature-ha': + auto-trigger-name: 'joid-{scenario}-{pod}-trigger' + - 'os-odl_l2-nofeature-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-onos-nofeature-ha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-onos-nofeature-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-ocl-nofeature-ha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-ocl-nofeature-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' jobs: - - 'joid-{sdn-controller}-{pod}-daily-{stream}' + - 'joid-{scenario}-{pod}-daily-{stream}' - 'joid-deploy-{pod}-daily-{stream}' ######################## # job templates ######################## - job-template: - name: 'joid-{sdn-controller}-{pod}-daily-{stream}' + name: 'joid-{scenario}-{pod}-daily-{stream}' project-type: multijob - disabled: '{obj:disabled}' - concurrent: false + properties: + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'joid-os-.*?-{pod}-daily-{stream}' + wrappers: - build-name: - name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO' + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' triggers: - - 'joid-{pod}-{sdn-controller}-trigger' + - '{auto-trigger-name}' parameters: - project-parameter: @@ -77,17 +94,8 @@ - '{installer}-defaults' - '{pod}-defaults' - string: - name: SDN_CONTROLLER - default: '{sdn-controller}' - - string: name: DEPLOY_SCENARIO - default: 'none' - - scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' + default: '{scenario}' builders: - multijob: @@ -96,7 +104,6 @@ projects: - name: 'joid-deploy-{pod}-daily-{stream}' current-parameters: true - git-revision: true kill-phase-on: FAILURE - multijob: name: functest @@ -116,13 +123,21 @@ - job-template: name: 'joid-deploy-{pod}-daily-{stream}' - disabled: false - concurrent: false + properties: + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'joid-deploy-{pod}-daily-{stream}' + wrappers: - build-name: - name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO' + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - timeout: timeout: 180 fail: true @@ -162,26 +177,18 @@ # trigger macros ######################## - trigger: - name: 'joid-intel-pod5-odl-trigger' + name: 'joid-os-odl_l2-nofeature-ha-intel-pod5-trigger' triggers: - timed: '0 2 * * *' - trigger: - name: 'joid-intel-pod6-odl-trigger' + name: 'joid-os-odl_l2-nofeature-ha-intel-pod6-trigger' triggers: - timed: '0 2 * * *' - trigger: - name: 'joid-orange-pod2-odl-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-intel-pod5-onos-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-intel-pod6-onos-trigger' + name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-trigger' triggers: - timed: '' - trigger: - name: 'joid-orange-pod2-onos-trigger' + name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-trigger' triggers: - timed: '' |