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 "xci: Make OSA playbook to use during installation configurable"
[releng.git]
/
jjb
/
yardstick
/
yardstick-ci-jobs.yml
diff --git
a/jjb/yardstick/yardstick-ci-jobs.yml
b/jjb/yardstick/yardstick-ci-jobs.yml
index
c10daab
..
1f2f312
100644
(file)
--- a/
jjb/yardstick/yardstick-ci-jobs.yml
+++ b/
jjb/yardstick/yardstick-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'
@@
-43,12
+43,12
@@
slave-label: fuel-baremetal
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
slave-label: fuel-baremetal
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *
colorado
+ <<: *
danube
- virtual:
slave-label: fuel-virtual
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- virtual:
slave-label: fuel-virtual
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *
colorado
+ <<: *
danube
# armband CI PODs
- armband-baremetal:
slave-label: armband-baremetal
# armband CI PODs
- armband-baremetal:
slave-label: armband-baremetal
@@
-64,12
+64,12
@@
slave-label: armband-baremetal
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
slave-label: armband-baremetal
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *
colorado
+ <<: *
danube
- armband-virtual:
slave-label: armband-virtual
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- armband-virtual:
slave-label: armband-virtual
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *
colorado
+ <<: *
danube
# joid CI PODs
- baremetal:
slave-label: joid-baremetal
# joid CI PODs
- baremetal:
slave-label: joid-baremetal
@@
-85,12
+85,12
@@
slave-label: joid-baremetal
installer: joid
auto-trigger-name: 'daily-trigger-disabled'
slave-label: joid-baremetal
installer: joid
auto-trigger-name: 'daily-trigger-disabled'
- <<: *
colorado
+ <<: *
danube
- virtual:
slave-label: joid-virtual
installer: joid
auto-trigger-name: 'daily-trigger-disabled'
- virtual:
slave-label: joid-virtual
installer: joid
auto-trigger-name: 'daily-trigger-disabled'
- <<: *
colorado
+ <<: *
danube
# compass CI PODs
- baremetal:
# compass CI PODs
- baremetal:
@@
-107,12
+107,12
@@
slave-label: compass-baremetal
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
slave-label: compass-baremetal
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *
colorado
+ <<: *
danube
- virtual:
slave-label: compass-virtual
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- virtual:
slave-label: compass-virtual
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *
colorado
+ <<: *
danube
#--------------------------------
# Installers not using labels
# CI PODs
#--------------------------------
# Installers not using labels
# CI PODs
@@
-128,7
+128,7
@@
slave-label: '{pod}'
installer: apex
auto-trigger-name: 'daily-trigger-disabled'
slave-label: '{pod}'
installer: apex
auto-trigger-name: 'daily-trigger-disabled'
- <<: *
colorado
+ <<: *
danube
#--------------------------------
# None-CI PODs
#--------------------------------
#--------------------------------
# None-CI PODs
#--------------------------------
@@
-146,7
+146,7
@@
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *
colorado
+ <<: *
danube
- zte-pod2:
slave-label: '{pod}'
installer: fuel
- zte-pod2:
slave-label: '{pod}'
installer: fuel
@@
-161,7
+161,7
@@
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *
colorado
+ <<: *
danube
- arm-pod2:
slave-label: '{pod}'
installer: fuel
- arm-pod2:
slave-label: '{pod}'
installer: fuel
@@
-171,7
+171,7
@@
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *
colorado
+ <<: *
danube
- arm-pod3:
slave-label: '{pod}'
installer: fuel
- arm-pod3:
slave-label: '{pod}'
installer: fuel
@@
-181,7
+181,7
@@
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *
colorado
+ <<: *
danube
- orange-pod2:
slave-label: '{pod}'
installer: joid
- orange-pod2:
slave-label: '{pod}'
installer: joid
@@
-197,8
+197,8
@@
installer: compass
auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger'
<<: *master
installer: compass
auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger'
<<: *master
- -
huawei-pod5
:
- slave-label: '
{pod}
'
+ -
baremetal-centos
:
+ slave-label: '
intel-pod8
'
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
@@
-220,6
+220,7
@@
concurrent: true
properties:
concurrent: true
properties:
+ - logrotate-default
- throttle:
enabled: true
max-per-node: 1
- throttle:
enabled: true
max-per-node: 1
@@
-238,6
+239,7
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ branch: '{branch}'
- '{installer}-defaults'
- '{slave-label}-defaults'
- 'yardstick-params-{slave-label}'
- '{installer}-defaults'
- '{slave-label}-defaults'
- 'yardstick-params-{slave-label}'
@@
-258,10
+260,7
@@
description: "Show debut output information"
scm:
description: "Show debut output information"
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
builders:
- description-setter:
builders:
- description-setter:
@@
-269,10
+268,11
@@
- 'yardstick-cleanup'
#- 'yardstick-fetch-os-creds'
- 'yardstick-{testsuite}'
- 'yardstick-cleanup'
#- 'yardstick-fetch-os-creds'
- 'yardstick-{testsuite}'
+ - 'yardstick-store-results'
publishers:
- email:
publishers:
- email:
- recipients: jean.gaoliang@huawei.com
matthew.lijun
@huawei.com
+ recipients: jean.gaoliang@huawei.com
limingjiang
@huawei.com
########################
# builder macros
########################
# builder macros
@@
-295,6
+295,12
@@
- shell:
!include-raw: ../../utils/fetch_os_creds.sh
- shell:
!include-raw: ../../utils/fetch_os_creds.sh
+- builder:
+ name: yardstick-store-results
+ builders:
+ - shell:
+ !include-raw: ../../utils/push-test-logs.sh
+
- builder:
name: yardstick-cleanup
builders:
- builder:
name: yardstick-cleanup
builders:
@@
-315,7
+321,7
@@
parameters:
- string:
name: YARDSTICK_DB_BACKEND
parameters:
- string:
name: YARDSTICK_DB_BACKEND
- default: ''
+ default: '
-i 104.197.68.199:8086
'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
name: 'yardstick-params-armband-baremetal'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
name: 'yardstick-params-armband-baremetal'
@@
-329,7
+335,7
@@
parameters:
- string:
name: YARDSTICK_DB_BACKEND
parameters:
- string:
name: YARDSTICK_DB_BACKEND
- default: ''
+ default: '
-i 104.197.68.199:8086
'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
name: 'yardstick-params-joid-baremetal'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
name: 'yardstick-params-joid-baremetal'
@@
-343,14
+349,14
@@
parameters:
- string:
name: YARDSTICK_DB_BACKEND
parameters:
- string:
name: YARDSTICK_DB_BACKEND
- default: ''
+ default: '
-i 104.197.68.199:8086
'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
name: 'yardstick-params-intel-pod8'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
description: 'Arguments to use in order to choose the backend DB'
- parameter:
name: 'yardstick-params-intel-pod8'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
- default: ''
+ default: '
-i 104.197.68.199:8086
'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
name: 'yardstick-params-lf-pod1'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
name: 'yardstick-params-lf-pod1'
@@
-375,15
+381,6
@@
name: YARDSTICK_DB_BACKEND
default: '-i 104.197.68.199:8086'
description: 'Arguments to use in order to choose the backend DB'
name: YARDSTICK_DB_BACKEND
default: '-i 104.197.68.199:8086'
description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
- name: 'yardstick-params-huawei-pod5'
- parameters:
- - string:
- name: YARDSTICK_DB_BACKEND
- default: '-i 104.197.68.199:8086'
- description: 'Arguments to use in order to choose the backend DB'
-
- parameter:
name: 'yardstick-params-zte-pod1'
parameters:
- parameter:
name: 'yardstick-params-zte-pod1'
parameters:
@@
-445,7
+442,7
@@
parameters:
- string:
name: YARDSTICK_DB_BACKEND
parameters:
- string:
name: YARDSTICK_DB_BACKEND
- default: ''
+ default: '
-i 104.197.68.199:8086
'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
description: 'Arguments to use in order to choose the backend DB'
- parameter:
@@
-453,7
+450,7
@@
parameters:
- string:
name: YARDSTICK_DB_BACKEND
parameters:
- string:
name: YARDSTICK_DB_BACKEND
- default: ''
+ default: '
-i 104.197.68.199:8086
'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
description: 'Arguments to use in order to choose the backend DB'
- parameter:
@@
-461,7
+458,7
@@
parameters:
- string:
name: YARDSTICK_DB_BACKEND
parameters:
- string:
name: YARDSTICK_DB_BACKEND
- default: ''
+ default: '
-i 104.197.68.199:8086
'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
description: 'Arguments to use in order to choose the backend DB'
- parameter:
@@
-469,7
+466,7
@@
parameters:
- string:
name: YARDSTICK_DB_BACKEND
parameters:
- string:
name: YARDSTICK_DB_BACKEND
- default: ''
+ default: '
-i 104.197.68.199:8086
'
description: 'Arguments to use in order to choose the backend DB'
#######################
description: 'Arguments to use in order to choose the backend DB'
#######################