Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
keep weekly-trigger-disabled and enable compass-dovetail weekly trigger
[releng.git]
/
jjb
/
functest
/
functest-ci-jobs.yml
diff --git
a/jjb/functest/functest-ci-jobs.yml
b/jjb/functest/functest-ci-jobs.yml
index
0f0caba
..
7478e2a
100644
(file)
--- a/
jjb/functest/functest-ci-jobs.yml
+++ b/
jjb/functest/functest-ci-jobs.yml
@@
-14,8
+14,8
@@
branch: '{stream}'
gs-pathname: ''
docker-tag: 'latest'
branch: '{stream}'
gs-pathname: ''
docker-tag: 'latest'
- colorado: &colorado
- stream:
colorado
+ danube: &danube
+ stream:
danube
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
docker-tag: 'stable'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
docker-tag: 'stable'
@@
-40,11
+40,11
@@
- baremetal:
slave-label: fuel-baremetal
installer: fuel
- baremetal:
slave-label: fuel-baremetal
installer: fuel
- <<: *
colorado
+ <<: *
danube
- virtual:
slave-label: fuel-virtual
installer: fuel
- virtual:
slave-label: fuel-virtual
installer: fuel
- <<: *
colorado
+ <<: *
danube
# joid CI PODs
- baremetal:
slave-label: joid-baremetal
# joid CI PODs
- baremetal:
slave-label: joid-baremetal
@@
-57,11
+57,11
@@
- baremetal:
slave-label: joid-baremetal
installer: joid
- baremetal:
slave-label: joid-baremetal
installer: joid
- <<: *
colorado
+ <<: *
danube
- virtual:
slave-label: joid-virtual
installer: joid
- virtual:
slave-label: joid-virtual
installer: joid
- <<: *
colorado
+ <<: *
danube
# compass CI PODs
- baremetal:
slave-label: compass-baremetal
# compass CI PODs
- baremetal:
slave-label: compass-baremetal
@@
-74,11
+74,11
@@
- baremetal:
slave-label: compass-baremetal
installer: compass
- baremetal:
slave-label: compass-baremetal
installer: compass
- <<: *
colorado
+ <<: *
danube
- virtual:
slave-label: compass-virtual
installer: compass
- virtual:
slave-label: compass-virtual
installer: compass
- <<: *
colorado
+ <<: *
danube
# apex CI PODs
- apex-verify-master:
slave-label: '{pod}'
# apex CI PODs
- apex-verify-master:
slave-label: '{pod}'
@@
-88,14
+88,14
@@
slave-label: '{pod}'
installer: apex
<<: *master
slave-label: '{pod}'
installer: apex
<<: *master
-
- apex-verify-colorado
:
- slave-label: '{pod}'
- installer: apex
- <<: *colorado
-
- apex-daily-colorado
:
- slave-label: '{pod}'
- installer: apex
- <<: *colorado
+
# - apex-verify-danube
:
+
#
slave-label: '{pod}'
+
#
installer: apex
+# <<: *danube
+
# - apex-daily-danube
:
+
#
slave-label: '{pod}'
+
#
installer: apex
+# <<: *danube
# armband CI PODs
- armband-baremetal:
slave-label: armband-baremetal
# armband CI PODs
- armband-baremetal:
slave-label: armband-baremetal
@@
-108,11
+108,16
@@
- armband-baremetal:
slave-label: armband-baremetal
installer: fuel
- armband-baremetal:
slave-label: armband-baremetal
installer: fuel
- <<: *
colorado
+ <<: *
danube
- armband-virtual:
slave-label: armband-virtual
installer: fuel
- armband-virtual:
slave-label: armband-virtual
installer: fuel
- <<: *colorado
+ <<: *danube
+# netvirt 3rd party ci
+ - virtual:
+ slave-label: odl-netvirt-virtual
+ installer: netvirt
+ <<: *master
#--------------------------------
# None-CI PODs
#--------------------------------
#--------------------------------
# None-CI PODs
#--------------------------------
@@
-128,7
+133,7
@@
slave-label: '{pod}'
installer: joid
<<: *master
slave-label: '{pod}'
installer: joid
<<: *master
- - huawei-pod
2
:
+ - huawei-pod
5
:
slave-label: '{pod}'
installer: compass
<<: *master
slave-label: '{pod}'
installer: compass
<<: *master
@@
-140,6
+145,10
@@
slave-label: '{pod}'
installer: fuel
<<: *master
slave-label: '{pod}'
installer: fuel
<<: *master
+ - arm-pod3:
+ slave-label: '{pod}'
+ installer: fuel
+ <<: *master
- zte-pod1:
slave-label: '{pod}'
installer: fuel
- zte-pod1:
slave-label: '{pod}'
installer: fuel
@@
-147,7
+156,7
@@
- zte-pod1:
slave-label: '{pod}'
installer: fuel
- zte-pod1:
slave-label: '{pod}'
installer: fuel
- <<: *
colorado
+ <<: *
danube
- zte-pod2:
slave-label: '{pod}'
installer: fuel
- zte-pod2:
slave-label: '{pod}'
installer: fuel
@@
-159,11
+168,20
@@
- zte-pod3:
slave-label: '{pod}'
installer: fuel
- zte-pod3:
slave-label: '{pod}'
installer: fuel
- <<: *
colorado
+ <<: *
danube
- arm-pod2:
slave-label: '{pod}'
installer: fuel
- arm-pod2:
slave-label: '{pod}'
installer: fuel
- <<: *colorado
+ <<: *danube
+ - arm-pod3:
+ slave-label: '{pod}'
+ installer: fuel
+ <<: *danube
+# PODs for verify jobs triggered by each patch upload
+ - ool-virtual1:
+ slave-label: '{pod}'
+ installer: apex
+ <<: *master
#--------------------------------
testsuite:
#--------------------------------
testsuite:
@@
-186,6
+204,7
@@
concurrent: true
properties:
concurrent: true
properties:
+ - logrotate-default
- throttle:
enabled: true
max-per-node: 1
- throttle:
enabled: true
max-per-node: 1
@@
-201,6
+220,7
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ branch: '{branch}'
- '{installer}-defaults'
- '{slave-label}-defaults'
- 'functest-{testsuite}-parameter'
- '{installer}-defaults'
- '{slave-label}-defaults'
- 'functest-{testsuite}-parameter'
@@
-211,14
+231,15
@@
name: DOCKER_TAG
default: '{docker-tag}'
description: 'Tag to pull docker image'
name: DOCKER_TAG
default: '{docker-tag}'
description: 'Tag to pull docker image'
+ - string:
+ name: CLEAN_DOCKER_IMAGES
+ default: 'false'
+ description: 'Remove downloaded docker images (opnfv/functest:*)'
- functest-parameter:
gs-pathname: '{gs-pathname}'
scm:
- functest-parameter:
gs-pathname: '{gs-pathname}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
builders:
- description-setter:
builders:
- description-setter:
@@
-264,6
+285,10
@@
- 'vims'
- 'multisite'
- 'parser'
- 'vims'
- 'multisite'
- 'parser'
+ - string:
+ name: TESTCASE_OPTIONS
+ default: ''
+ description: 'Additional parameters specific to test case(s)'
- parameter:
name: functest-parameter
parameters:
- parameter:
name: functest-parameter
parameters:
@@
-283,6
+308,10
@@
name: CI_DEBUG
default: 'false'
description: "Show debug output information"
name: CI_DEBUG
default: 'false'
description: "Show debug output information"
+ - string:
+ name: RC_FILE_PATH
+ default: ''
+ description: "Path to the OS credentials file if given"
########################
# trigger macros
########################
########################
# trigger macros
########################