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/scripts/vpp/debug-build.sh | |
| 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/scripts/vpp/debug-build.sh')
| -rw-r--r-- | jjb/scripts/vpp/debug-build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jjb/scripts/vpp/debug-build.sh b/jjb/scripts/vpp/debug-build.sh index 8e5320c3..68338df5 100644 --- a/jjb/scripts/vpp/debug-build.sh +++ b/jjb/scripts/vpp/debug-build.sh @@ -45,7 +45,7 @@ make_build_test_debug() { BUILD_ERROR="FAILED 'make build'" return fi - if [ "${OS_ID}-${OS_VERSION_ID}" == "${MAKE_TEST_OS}" ] ; then + if grep -q "${OS_ID}-${OS_VERSION_ID}" <<< "${MAKE_TEST_OS}"; then if [ -n "${MAKE_PARALLEL_JOBS}" ] ; then TEST_JOBS="${MAKE_PARALLEL_JOBS}" echo "Testing VPP with ${TEST_JOBS} cores." |