diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-07 14:37:40 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-07 14:55:48 +0000 |
| commit | e8ce776643726d0e8f9ff8d6cc0145358ffd3bf0 (patch) | |
| tree | 0ae6865789e89d1dc8632b6d7b04f6a4697d0487 /jjb/fuel/fuel-ci-jobs.yml | |
| parent | 324a87b519694309d141bbec8d15726d9cc1adb8 (diff) | |
Enable fuel nosdn scenario for master and stable/brahmaputra
This patch proposes below changes:
- Run CI on opnfv-jump-2 against stable/brahmaputra branch
- Run CI on ericsson-pod2 against master branch
- Configure functest against both branches on both PODs
- Enable yardstick against both branches on both PODs
- Comment out additional controllers until nosdn scenario is verified
- Rename OPNFV_FEATURE to DEPLOY_SCENARIO
Change-Id: Ie3d4f946cd51271378b435f9a92af07aaf614c26
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/fuel/fuel-ci-jobs.yml')
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 51 |
1 files changed, 23 insertions, 28 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 888287909..1b4b26963 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -2,9 +2,9 @@ name: 'fuel' - project: 'fuel' + project: '{name}' - installer: 'fuel' + installer: '{name}' #-------------------------------- # BRANCH ANCHORS @@ -20,36 +20,31 @@ #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- -# Current Mapping -#-------------------------------- -# everything runs against master branch +# brahmaputra #-------------------------------- pod: - opnfv-jump-2: - <<: *master + <<: *brahmaputra +#-------------------------------- +# master +#-------------------------------- - ericsson-pod1: <<: *master - ericsson-pod2: <<: *master #-------------------------------- -# Milestone E Mapping -# !!!DO NOT ENABLE!!! -#-------------------------------- -# brahmaputra -#-------------------------------- -# - opnfv-jump-2: -# <<: *brahmaputra # please check the triggers before enabling any of the controllers!!! sdn-controller: - 'nosdn': disabled: false - - 'odl': - disabled: true - - 'onos': - disabled: true - - 'opencontrail': - disabled: true +# commented out below controllers to get nosdn scenario settled first +# - 'odl': +# disabled: true +# - 'onos': +# disabled: true +# - 'opencontrail': +# disabled: true jobs: - 'fuel-{sdn-controller}-{pod}-daily-{stream}' @@ -75,10 +70,10 @@ wrappers: - build-name: - name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Feature: $OPNFV_FEATURE' + name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO' triggers: - - 'fuel-{pod}-trigger' + - 'fuel-{pod}-{sdn-controller}-trigger' parameters: - project-parameter: @@ -89,7 +84,7 @@ name: SDN_CONTROLLER default: '{sdn-controller}' - string: - name: OPNFV_FEATURE + name: DEPLOY_SCENARIO default: 'none' - fuel-ci-parameter: gs-pathname: '{gs-pathname}' @@ -151,7 +146,7 @@ wrappers: - build-name: - name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Feature: $OPNFV_FEATURE' + name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO' builders: - shell: @@ -186,14 +181,14 @@ # trigger for opnfv-jump-2 is set to run 1 hour ahead of others # to prevent doing unnecessary builds - trigger: - name: 'fuel-opnfv-jump-2-trigger' + name: 'fuel-opnfv-jump-2-nosdn-trigger' triggers: - timed: '0 2 * * *' - trigger: - name: 'fuel-ericsson-pod1-trigger' + name: 'fuel-ericsson-pod1-nosdn-trigger' triggers: - - timed: '0 3 * * *' + - timed: '0 2 * * *' - trigger: - name: 'fuel-ericsson-pod2-trigger' + name: 'fuel-ericsson-pod2-nosdn-trigger' triggers: - - timed: '0 3 * * *' + - timed: '0 2 * * *' |