Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Enable daisy euphrates jobs of daily and functest"
[releng.git]
/
jjb
/
functest
/
functest-daily-jobs.yml
diff --git
a/jjb/functest/functest-daily-jobs.yml
b/jjb/functest/functest-daily-jobs.yml
index
f47120b
..
04a2936
100644
(file)
--- a/
jjb/functest/functest-daily-jobs.yml
+++ b/
jjb/functest/functest-daily-jobs.yml
@@
-228,7
+228,7
@@
wrappers:
- build-name:
wrappers:
- build-name:
- name: '$BUILD_NUMBER Suite: $FUNCTEST_
SUITE_NAM
E Scenario: $DEPLOY_SCENARIO'
+ name: '$BUILD_NUMBER Suite: $FUNCTEST_
MOD
E Scenario: $DEPLOY_SCENARIO'
- timeout:
timeout: '{job-timeout}'
abort: true
- timeout:
timeout: '{job-timeout}'
abort: true
@@
-309,19
+309,26
@@
name: functest-daily-parameter
parameters:
- string:
name: functest-daily-parameter
parameters:
- string:
- name: FUNCTEST_
SUITE_NAM
E
+ name: FUNCTEST_
MOD
E
default: 'daily'
description: "Daily suite name to run"
- parameter:
name: functest-arm-daily-parameter
parameters:
- string:
default: 'daily'
description: "Daily suite name to run"
- parameter:
name: functest-arm-daily-parameter
parameters:
- string:
- name: FUNCTEST_
SUITE_NAM
E
+ name: FUNCTEST_
MOD
E
default: 'arm-daily'
description: "Daily suite name (Aarch64) to run"
- parameter:
name: functest-suite-parameter
parameters:
default: 'arm-daily'
description: "Daily suite name (Aarch64) to run"
- parameter:
name: functest-suite-parameter
parameters:
+ - choice:
+ name: FUNCTEST_MODE
+ choices:
+ - 'tier'
+ - 'testcase'
+ default: 'tier'
+ description: "Test case or Tier to be run"
- choice:
name: FUNCTEST_SUITE_NAME
choices:
- choice:
name: FUNCTEST_SUITE_NAME
choices:
@@
-334,7
+341,6
@@
- 'rally_sanity'
- 'odl'
- 'odl_netvirt'
- 'rally_sanity'
- 'odl'
- 'odl_netvirt'
- - 'onos'
- 'snaps_smoke'
- 'refstack_defcore'
- 'promise'
- 'snaps_smoke'
- 'refstack_defcore'
- 'promise'
@@
-348,6
+354,16
@@
- 'cloudify_vrouter'
- 'orchestra_openims'
- 'orchestra_clearwaterims'
- 'cloudify_vrouter'
- 'orchestra_openims'
- 'orchestra_clearwaterims'
+ default: 'connection_check'
+ - choice:
+ name: FUNCTEST_TIER
+ choices:
+ - 'healthcheck'
+ - 'smoke'
+ - 'features'
+ - 'components'
+ - 'vnf'
+ default: 'healthcheck'
- string:
name: TESTCASE_OPTIONS
default: ''
- string:
name: TESTCASE_OPTIONS
default: ''
@@
-407,7
+423,7
@@
name: functest-suite-builder
builders:
- 'functest-cleanup'
name: functest-suite-builder
builders:
- 'functest-cleanup'
- - 'set-functest-env'
+ - 'set-functest-env
-alpine
'
- 'functest-suite'
- 'functest-store-results'
- 'functest-exit'
- 'functest-suite'
- 'functest-store-results'
- 'functest-exit'
@@
-419,6
+435,7
@@
- 'set-functest-env-alpine'
- 'functest-daily'
- 'functest-store-results'
- 'set-functest-env-alpine'
- 'functest-daily'
- 'functest-store-results'
+ - 'functest-exit'
- builder:
name: functest-daily
- builder:
name: functest-daily
@@
-439,7
+456,8
@@
name: functest-suite
builders:
- shell:
name: functest-suite
builders:
- shell:
- !include-raw: ./functest-suite.sh
+ !include-raw:
+ - ./functest-alpine.sh
- builder:
name: set-functest-env
- builder:
name: set-functest-env