diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2023-01-20 19:12:12 -0500 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2023-01-20 19:12:12 -0500 |
| commit | bc8c27babb56a3f446a67508ec3afe87afb86d53 (patch) | |
| tree | 7ea332c7c1dd9cc2655c3019dba9466353a9c035 /jjb/vpp/vpp.yaml | |
| parent | 01bca2a712475697f61b1eea8e7990c09a71170d (diff) | |
Allow multiple OS's for make test and vppapigen
- And change VPP verify/merge jobs to run 'make test'
on both ubuntu-22.04 and ubuntu-20.04
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I7a9b488c063d3229e82ba29ecd4806e632dc0537
Diffstat (limited to 'jjb/vpp/vpp.yaml')
| -rw-r--r-- | jjb/vpp/vpp.yaml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 6b14e7ee..fa3d7e07 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -85,7 +85,7 @@ - 'master': branch: 'master' branch-refspec: '' - make-test-os: 'ubuntu-22.04' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' make-test-multiworker-os: 'debian-11' - '2206': branch: 'stable/2206' @@ -100,7 +100,7 @@ - '2302': branch: 'stable/2302' branch-refspec: '' - make-test-os: 'ubuntu-22.04' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' make-test-multiworker-os: 'debian-11' os: - debian11 @@ -125,13 +125,13 @@ - 'vpp-debug-verify-{stream}-{os}-{executor-arch}' project: 'vpp' make-parallel-jobs: '4' - make-test-os: 'ubuntu-22.04' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' comment-trigger-value: 'debug-verify' stream: - 'master': branch: 'master' branch-refspec: '' - make-test-os: 'ubuntu-22.04' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' os: 'ubuntu2204' executor-arch: 'x86_64' @@ -148,7 +148,7 @@ jobs: - 'vpp-dpdk-rdma-version-mismatch-{stream}-{os}-{executor-arch}' project: 'vpp' - make-test-os: 'ubuntu-22.04' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' comment-trigger-value: 'dpdk-rdma-version-mismatch' stream: - 'master': @@ -219,7 +219,7 @@ - 'master': branch: 'master' branch-refspec: '' - make-test-os: 'ubuntu-22.04' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' make-test-multiworker-os: '' - '2206': branch: 'stable/2206' @@ -234,7 +234,7 @@ - '2302': branch: 'stable/2302' branch-refspec: '' - make-test-os: 'ubuntu-22.04' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' make-test-multiworker-os: '' os: - ubuntu2004 |