Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
remove DEPLOY_SCENARIO from installer-params
[releng.git]
/
jjb
/
3rd_party_ci
/
odl-netvirt.yml
diff --git
a/jjb/3rd_party_ci/odl-netvirt.yml
b/jjb/3rd_party_ci/odl-netvirt.yml
index
3dd4c0b
..
a57bf17
100644
(file)
--- a/
jjb/3rd_party_ci/odl-netvirt.yml
+++ b/
jjb/3rd_party_ci/odl-netvirt.yml
@@
-3,7
+3,7
@@
project: 'netvirt'
project: 'netvirt'
- installer: '
apex
'
+ installer: '
netvirt
'
#####################################
# branch definitions
#####################################
#####################################
# branch definitions
#####################################
@@
-20,8
+20,6
@@
slave-label: 'ericsson-virtual5'
- 'install-netvirt':
slave-label: 'odl-netvirt-virtual'
slave-label: 'ericsson-virtual5'
- 'install-netvirt':
slave-label: 'odl-netvirt-virtual'
- - 'functest':
- slave-label: 'odl-netvirt-virtual'
- 'postprocess':
slave-label: 'odl-netvirt-virtual'
#####################################
- 'postprocess':
slave-label: 'odl-netvirt-virtual'
#####################################
@@
-43,6
+41,7
@@
concurrent: true
properties:
concurrent: true
properties:
+ - logrotate-default
- throttle:
enabled: true
max-total: 5
- throttle:
enabled: true
max-total: 5
@@
-119,10
+118,10
@@
name: functest
condition: SUCCESSFUL
projects:
name: functest
condition: SUCCESSFUL
projects:
- - name: 'functest-netvirt-virtual-
suite
-{stream}'
+ - name: 'functest-netvirt-virtual-
daily
-{stream}'
predefined-parameters: |
predefined-parameters: |
- FUNCTEST_SUITE_NAME=vping_userdata,bgpvpn
RC_FILE_PATH=/home/jenkins/cloner-info/overcloudrc
RC_FILE_PATH=/home/jenkins/cloner-info/overcloudrc
+ DEPLOY_SCENARIO=os-odl_l2-bgpvpn-noha
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: false
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: false
@@
-152,6
+151,7
@@
concurrent: true
properties:
concurrent: true
properties:
+ - logrotate-default
- throttle:
enabled: true
max-total: 5
- throttle:
enabled: true
max-total: 5
@@
-161,14
+161,12
@@
use-build-blocker: true
blocking-jobs:
- 'odl-netvirt-verify-virtual-install-.*'
use-build-blocker: true
blocking-jobs:
- 'odl-netvirt-verify-virtual-install-.*'
- - '
odl-netvirt-verify-virtual-functest
-.*'
+ - '
functest-netvirt-virtual-daily
-.*'
- 'odl-netvirt-verify-virtual-postprocess-.*'
block-level: 'NODE'
wrappers:
- 'odl-netvirt-verify-virtual-postprocess-.*'
block-level: 'NODE'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
- timeout:
timeout: 360
fail: true
@@
-180,6
+178,10
@@
branch: '{branch}'
- '{slave-label}-defaults'
- '{installer}-defaults'
branch: '{branch}'
- '{slave-label}-defaults'
- '{installer}-defaults'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-odl_l2-bgpvpn-noha'
+ description: 'Scenario to deploy and test'
builders:
- description-setter:
builders:
- description-setter:
@@
-200,11
+202,6
@@
!include-raw: ./download-netvirt-artifact.sh
- shell:
!include-raw: ./install-netvirt.sh
!include-raw: ./download-netvirt-artifact.sh
- shell:
!include-raw: ./install-netvirt.sh
-- builder:
- name: 'netvirt-verify-functest-builder'
- builders:
- - shell:
- !include-raw: ./functest-netvirt.sh
- builder:
name: 'netvirt-verify-postprocess-builder'
builders:
- builder:
name: 'netvirt-verify-postprocess-builder'
builders: