diff options
| -rw-r--r-- | jjb/ci-management/ci-management-jobs.yaml | 3 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 38 |
2 files changed, 22 insertions, 19 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml index e99855eb..10cb8938 100644 --- a/jjb/ci-management/ci-management-jobs.yaml +++ b/jjb/ci-management/ci-management-jobs.yaml @@ -6,7 +6,8 @@ - gerrit-jenkins-cfg-merge - gerrit-jenkins-sandbox-cleanup - gerrit-jjb-deploy-job - - gerrit-jjb-merge + - gerrit-jjb-merge: + build-node: centos7-builder-8c-8g - gerrit-jjb-verify project: ci-management diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index c518036e..f31c278a 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -114,6 +114,8 @@ repo-os-part: 'centos8' - debian9: repo-os-part: 'stretch' + - debian10: + repo-os-part: 'buster' - ubuntu2004: repo-os-part: 'ubuntu.focal.main' executor-arch: 'x86_64' @@ -158,24 +160,24 @@ # 'vpp-os-in-XXXX-x86_64' project. If no OSes are being # tested then this project should be commented out. # -- project: - name: vpp-beta-x86_64 - jobs: - - 'vpp-beta-verify-{stream}-{os}-{executor-arch}': - comment-trigger-value: 'vpp-beta-verify' - - 'vpp-beta-merge-{stream}-{os}-{executor-arch}': - comment-trigger-value: 'vpp-beta-merge' - project: 'vpp' - make-parallel-jobs: '4' - stream: - - master: - branch: 'master' - repo-stream-part: 'master' - branch-head-refspec: '' - os: - - debian10: - repo-os-part: 'buster' - executor-arch: x86_64 +#- project: +# name: vpp-beta-x86_64 +# jobs: +# - 'vpp-beta-verify-{stream}-{os}-{executor-arch}': +# comment-trigger-value: 'vpp-beta-verify' +# - 'vpp-beta-merge-{stream}-{os}-{executor-arch}': +# comment-trigger-value: 'vpp-beta-merge' +# project: 'vpp' +# make-parallel-jobs: '4' +# stream: +# - master: +# branch: 'master' +# repo-stream-part: 'master' +# branch-head-refspec: '' +# os: +# - debian10: +# repo-os-part: 'buster' +# executor-arch: x86_64 # [end] VPP-BETA-X86_64 PROJECT # VPP-GCC-X86_64 PROJECT |