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 "Remove quotes of parameter for functest-fuel-virtual-suite job"
[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
f8fdeb8
..
e85144c
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,20
@@
- 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
+# daisy CI PODs
+ - daisy-baremetal:
+ slave-label: daisy-baremetal
+ installer: daisy
+ <<: *master
+ - daisy-virtual:
+ slave-label: daisy-virtual
+ installer: daisy
+ <<: *master
# netvirt 3rd party ci
- virtual:
slave-label: odl-netvirt-virtual
# netvirt 3rd party ci
- virtual:
slave-label: odl-netvirt-virtual
@@
-133,8
+142,8
@@
slave-label: '{pod}'
installer: joid
<<: *master
slave-label: '{pod}'
installer: joid
<<: *master
- -
huawei-pod5
:
- slave-label: '
{pod}
'
+ -
baremetal-centos
:
+ slave-label: '
intel-pod8
'
installer: compass
<<: *master
- nokia-pod1:
installer: compass
<<: *master
- nokia-pod1:
@@
-156,7
+165,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
@@
-168,15
+177,15
@@
- 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
- arm-pod3:
slave-label: '{pod}'
installer: fuel
- <<: *
colorado
+ <<: *
danube
# PODs for verify jobs triggered by each patch upload
- ool-virtual1:
slave-label: '{pod}'
# PODs for verify jobs triggered by each patch upload
- ool-virtual1:
slave-label: '{pod}'
@@
-204,6
+213,7
@@
concurrent: true
properties:
concurrent: true
properties:
+ - logrotate-default
- throttle:
enabled: true
max-per-node: 1
- throttle:
enabled: true
max-per-node: 1
@@
-219,7
+229,6
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
- '{installer}-defaults'
- '{slave-label}-defaults'
branch: '{branch}'
- '{installer}-defaults'
- '{slave-label}-defaults'
@@
-234,7
+243,7
@@
- string:
name: CLEAN_DOCKER_IMAGES
default: 'false'
- string:
name: CLEAN_DOCKER_IMAGES
default: 'false'
- description: 'Remove downloaded docker images (opnfv/functest:*)'
+ description: 'Remove downloaded docker images (opnfv/functest
*
:*)'
- functest-parameter:
gs-pathname: '{gs-pathname}'
- functest-parameter:
gs-pathname: '{gs-pathname}'