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
Chore: Move to ubuntu2004-builder
[ci-management.git]
/
jjb
/
multicloud
/
multicloud-k8s.yaml
diff --git
a/jjb/multicloud/multicloud-k8s.yaml
b/jjb/multicloud/multicloud-k8s.yaml
index
283aa34
..
0420320
100644
(file)
--- a/
jjb/multicloud/multicloud-k8s.yaml
+++ b/
jjb/multicloud/multicloud-k8s.yaml
@@
-3,7
+3,7
@@
name: multicloud-k8s
project-name: 'multicloud-k8s'
path: 'src'
name: multicloud-k8s
project-name: 'multicloud-k8s'
path: 'src'
- golangver: 'golang11
2
'
+ golangver: 'golang11
4
'
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-verify-golang'
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-verify-golang'
@@
-12,7
+12,9
@@
script:
!include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
- '{project-name}-{stream}-{area}-verify-shell':
script:
!include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
- '{project-name}-{stream}-{area}-verify-shell':
+ disable-job: '{disable-kud}'
area: kud-deployment
area: kud-deployment
+ build-timeout: 45
script:
!include-raw-escape: 'kud-deployment.sh'
- '{project-name}-gerrit-release-jobs':
script:
!include-raw-escape: 'kud-deployment.sh'
- '{project-name}-gerrit-release-jobs':
@@
-25,16
+27,21
@@
stream:
- 'master':
branch: 'master'
stream:
- 'master':
branch: 'master'
+ - 'honolulu':
+ branch: 'honolulu'
+ #KUD fixes are not backported to maintenance branches
+ disable-kud: true
mvn-settings: 'multicloud-k8s-settings'
mvn-settings: 'multicloud-k8s-settings'
+ disable-kud: false
files: '**'
archive-artifacts: ''
files: '**'
archive-artifacts: ''
- build-node: ubuntu
18
04-builder-4c-4g
+ build-node: ubuntu
20
04-builder-4c-4g
#- project:
# name: multicloud-k8s-arm64
# project-name: 'multicloud-k8s-arm64'
# path: 'src/k8splugin'
#- project:
# name: multicloud-k8s-arm64
# project-name: 'multicloud-k8s-arm64'
# path: 'src/k8splugin'
-# golangver: 'golang11
2
'
+# golangver: 'golang11
4
'
# jobs:
# - '{project-name}-{stream}-docker-golang-shell-daily':
# script:
# jobs:
# - '{project-name}-{stream}-docker-golang-shell-daily':
# script:
@@
-51,12
+58,3
@@
# files: '**'
# archive-artifacts: ''
# build-node: ubuntu1804-docker-arm64-4c-2g
# files: '**'
# archive-artifacts: ''
# build-node: ubuntu1804-docker-arm64-4c-2g
-
-- project:
- name: multicloud-k8s-info
- project-name: multicloud-k8s
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: multicloud/k8s
- branch: master