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 "Use former calls to running Functest in Danube"
[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
5984b36
..
fdef6f4
100644
(file)
--- a/
jjb/functest/functest-daily-jobs.yml
+++ b/
jjb/functest/functest-daily-jobs.yml
@@
-80,22
+80,22
@@
installer: compass
<<: *danube
# apex CI PODs
installer: compass
<<: *danube
# apex CI PODs
- -
apex-verify-master
:
- slave-label:
'{pod}'
+ -
virtual
:
+ slave-label:
apex-virtual-master
installer: apex
<<: *master
installer: apex
<<: *master
- -
apex-daily-master
:
- slave-label:
'{pod}'
+ -
baremetal
:
+ slave-label:
apex-baremetal-master
installer: apex
<<: *master
installer: apex
<<: *master
-
# - apex-verify-danube
:
-# slave-label: '{pod}'
-
#
installer: apex
-
#
<<: *danube
-
# - apex-daily-danube
:
-# slave-label: '{pod}'
-
#
installer: apex
-
#
<<: *danube
+
- virtual
:
+ slave-label: apex-virtual-danube
+ installer: apex
+ <<: *danube
+
- baremetal
:
+ slave-label: apex-baremetal-danube
+ installer: apex
+ <<: *danube
# armband CI PODs
- armband-baremetal:
slave-label: armband-baremetal
# armband CI PODs
- armband-baremetal:
slave-label: armband-baremetal
@@
-158,6
+158,14
@@
slave-label: '{pod}'
installer: fuel
<<: *master
slave-label: '{pod}'
installer: fuel
<<: *master
+ - arm-pod4:
+ slave-label: '{pod}'
+ installer: fuel
+ <<: *master
+ - arm-virtual1:
+ slave-label: '{pod}'
+ installer: fuel
+ <<: *master
- zte-pod1:
slave-label: '{pod}'
installer: fuel
- zte-pod1:
slave-label: '{pod}'
installer: fuel
@@
-186,18
+194,26
@@
slave-label: '{pod}'
installer: fuel
<<: *danube
slave-label: '{pod}'
installer: fuel
<<: *danube
-# PODs for verify jobs triggered by each patch upload
- - ool-virtual1:
+ - arm-pod4:
slave-label: '{pod}'
slave-label: '{pod}'
- installer: apex
- <<: *master
+ installer: fuel
+ <<: *danube
+ - arm-virtual1:
+ slave-label: '{pod}'
+ installer: fuel
+ <<: *danube
+# PODs for verify jobs triggered by each patch upload
+# - ool-virtual1:
+# slave-label: '{pod}'
+# installer: apex
+# <<: *master
#--------------------------------
testsuite:
- 'suite':
job-timeout: 60
- 'daily':
#--------------------------------
testsuite:
- 'suite':
job-timeout: 60
- 'daily':
- job-timeout:
18
0
+ job-timeout:
24
0
jobs:
- 'functest-{installer}-{pod}-{testsuite}-{stream}'
jobs:
- 'functest-{installer}-{pod}-{testsuite}-{stream}'
@@
-286,6
+302,7
@@
- 'vims'
- 'multisite'
- 'parser'
- 'vims'
- 'multisite'
- 'parser'
+ - 'opera_vims'
- string:
name: TESTCASE_OPTIONS
default: ''
- string:
name: TESTCASE_OPTIONS
default: ''
@@
-339,6
+356,8
@@
- 'functest-cleanup'
- 'set-functest-env'
- 'functest-suite'
- 'functest-cleanup'
- 'set-functest-env'
- 'functest-suite'
+ - 'functest-store-results'
+ - 'functest-exit'
- builder:
name: functest-daily
- builder:
name: functest-daily
@@
-357,7
+376,10
@@
name: set-functest-env
builders:
- shell:
name: set-functest-env
builders:
- shell:
- !include-raw: ./set-functest-env.sh
+ !include-raw:
+ - ./functest-env-presetup.sh
+ - ../../utils/fetch_os_creds.sh
+ - ./set-functest-env.sh
- builder:
name: functest-store-results
- builder:
name: functest-store-results