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 "Refactor Daisy verify jobs"
[releng.git]
/
jjb
/
bottlenecks
/
bottlenecks-ci-jobs.yml
diff --git
a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index
4bc56ab
..
a9ccd69
100644
(file)
--- a/
jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/
jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@
-18,8
+18,8
@@
gs-packagepath: '/{suite}'
#docker tag used for version control
docker-tag: 'latest'
gs-packagepath: '/{suite}'
#docker tag used for version control
docker-tag: 'latest'
- colorado: &colorado
- stream:
colorado
+ danube: &danube
+ stream:
danube
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
gs-packagepath: '/{stream}/{suite}'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
gs-packagepath: '/{stream}/{suite}'
@@
-48,12
+48,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
#--------------------------------
# None-CI PODs
#--------------------------------
# None-CI PODs
@@
-62,22
+62,17
@@
# slave-label: '{pod}'
# installer: joid
# auto-trigger-name: 'daily-trigger-disabled'
# slave-label: '{pod}'
# installer: joid
# auto-trigger-name: 'daily-trigger-disabled'
- # <<: *
colorado
+ # <<: *
danube
# - orange-pod2:
# slave-label: '{pod}'
# installer: joid
# auto-trigger-name: 'daily-trigger-disabled'
# <<: *master
# - orange-pod2:
# slave-label: '{pod}'
# installer: joid
# auto-trigger-name: 'daily-trigger-disabled'
# <<: *master
- - huawei-pod2:
- slave-label: '{pod}'
- installer: compass
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *master
-
#--------------------------------------------
suite:
- 'rubbos'
- 'vstf'
#--------------------------------------------
suite:
- 'rubbos'
- 'vstf'
+ - 'posca'
jobs:
- 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}'
jobs:
- 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}'
@@
-101,6
+96,7
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ branch: '{branch}'
- '{slave-label}-defaults'
- '{installer}-defaults'
- 'bottlenecks-params-{slave-label}'
- '{slave-label}-defaults'
- '{installer}-defaults'
- 'bottlenecks-params-{slave-label}'
@@
-125,10
+121,7
@@
description: "docker image tag used for version control"
scm:
description: "docker image tag used for version control"
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
builders:
- 'bottlenecks-env-cleanup'
builders:
- 'bottlenecks-env-cleanup'
@@
-224,14
+217,6
@@
default: ''
description: 'Arguments to use in order to choose the backend DB'
default: ''
description: 'Arguments to use in order to choose the backend DB'
-- parameter:
- name: 'bottlenecks-params-huawei-pod2'
- parameters:
- - string:
- name: BOTTLENECKS_DB_TARGET
- default: '104.197.68.199:8086'
- description: 'Arguments to use in order to choose the backend DB'
-
- parameter:
name: 'bottlenecks-params-orange-pod2'
parameters:
- parameter:
name: 'bottlenecks-params-orange-pod2'
parameters: