Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Feat!: Upgrade Jenkins-job-builder to 6x
[ci-management.git]
/
jjb
/
ci-management
/
ci-management-jobs.yaml
diff --git
a/jjb/ci-management/ci-management-jobs.yaml
b/jjb/ci-management/ci-management-jobs.yaml
index
b071cb9
..
3380eda
100644
(file)
--- a/
jjb/ci-management/ci-management-jobs.yaml
+++ b/
jjb/ci-management/ci-management-jobs.yaml
@@
-3,16
+3,18
@@
name: ci-management-ci-jobs
jobs:
- gerrit-jenkins-cfg-verify
name: ci-management-ci-jobs
jobs:
- gerrit-jenkins-cfg-verify
+ - gerrit-jenkins-cfg-merge
- gerrit-jenkins-sandbox-cleanup
- gerrit-jjb-deploy-job
- gerrit-jenkins-sandbox-cleanup
- gerrit-jjb-deploy-job
- - gerrit-jjb-merge
+ - gerrit-jjb-merge:
+ build-node: centos8-builder-2c-2g
- gerrit-jjb-verify
project: ci-management
project-name: ci-management
- gerrit-jjb-verify
project: ci-management
project-name: ci-management
- build-node: centos
7-builder-4c-4
g
- build-timeout:
30
- jjb-version:
2.6
.0
+ build-node: centos
8-builder-2c-2
g
+ build-timeout:
15
+ jjb-version:
6.0
.0
- project:
name: ci-management
- project:
name: ci-management
@@
-25,6
+27,6
@@
project-name: ci-management
jobs:
- gerrit-info-yaml-verify
project-name: ci-management
jobs:
- gerrit-info-yaml-verify
- build-node: centos
7-builder-4c-4
g
+ build-node: centos
8-builder-2c-2
g
project: ci-management
branch: master
project: ci-management
branch: master