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 | |
| 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')
| -rw-r--r-- | jjb/scripts/vpp/build.sh | 8 | ||||
| -rw-r--r-- | jjb/scripts/vpp/debug-build.sh | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/jjb/scripts/vpp/build.sh b/jjb/scripts/vpp/build.sh index 34d16d494..388d05c5d 100644 --- a/jjb/scripts/vpp/build.sh +++ b/jjb/scripts/vpp/build.sh @@ -80,13 +80,13 @@ make_build_test() { echo "Testing VPP with automatically calculated number of cores. " \ "See test logs for the exact number." fi - if [ "${OS_ID}-${OS_VERSION_ID}" == "${VPPAPIGEN_TEST_OS}" ] ; then + if grep -q "${OS_ID}-${OS_VERSION_ID}" <<< "${VPPAPIGEN_TEST_OS}"; then if ! src/tools/vppapigen/test_vppapigen.py ; then BUILD_ERROR="FAILED src/tools/vppapigen/test_vppapigen.py" return fi fi - if [ "${OS_ID}-${OS_VERSION_ID}" == "${MAKE_TEST_OS}" ] ; then + if grep -q "${OS_ID}-${OS_VERSION_ID}" <<< "${MAKE_TEST_OS}"; then if ! make COMPRESS_FAILED_TEST_LOGS=yes TEST_JOBS="$TEST_JOBS" RETRIES=3 test ; then BUILD_ERROR="FAILED 'make test'" return @@ -94,7 +94,7 @@ make_build_test() { else echo "Skip running 'make test' on ${OS_ID}-${OS_VERSION_ID}" fi - if [ "${OS_ID}-${OS_VERSION_ID}" == "${MAKE_TEST_MULTIWORKER_OS}" ] ; then + if grep -q "${OS_ID}-${OS_VERSION_ID}" <<< "${MAKE_TEST_MULTIWORKER_OS}"; then if git grep -q VPP_WORKER_CONFIG ; then if ! make VPP_WORKER_CONFIG="workers 2" COMPRESS_FAILED_TEST_LOGS=yes \ RETRIES=3 TEST_JOBS="$TEST_JOBS" test ; then @@ -116,6 +116,8 @@ make_build_test() { else echo "Skip running MULTIWORKER MAKE TEST on ${OS_ID}-${OS_VERSION_ID}" fi + else + echo "Skip running MULTIWORKER MAKE TEST on ${OS_ID}-${OS_VERSION_ID}" fi } diff --git a/jjb/scripts/vpp/debug-build.sh b/jjb/scripts/vpp/debug-build.sh index 8e5320c30..68338df56 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." |