From e6622f6697fbb1014152c52fd6ba92a7a585f97a Mon Sep 17 00:00:00 2001 From: George Joseph Date: Wed, 24 Jul 2019 14:15:27 -0600 Subject: [PATCH] CI: Don't enable non-core modules in Certified branches We don't support non-core modules for Certified releases but we were enabling them for CI builds which was causing lots of test failures. Now we don't. Change-Id: I0b3254c08a2479f3d39151690350cce5ce5ad766 --- tests/CI/buildAsterisk.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/CI/buildAsterisk.sh b/tests/CI/buildAsterisk.sh index 6877eaf438..adbc3b0964 100755 --- a/tests/CI/buildAsterisk.sh +++ b/tests/CI/buildAsterisk.sh @@ -116,12 +116,20 @@ if [ $NO_MENUSELECT -eq 0 ] ; then runner menuselect/menuselect --enable REF_DEBUG menuselect.makeopts fi - cat_enables="MENUSELECT_BRIDGES MENUSELECT_CEL MENUSELECT_CDR" - cat_enables+=" MENUSELECT_CHANNELS MENUSELECT_CODECS MENUSELECT_FORMATS MENUSELECT_FUNCS" - cat_enables+=" MENUSELECT_PBX MENUSELECT_RES MENUSELECT_UTILS MENUSELECT_TESTS" + cat_enables="MENUSELECT_TESTS" + mod_disables="" + + if [[ ! "${BRANCH_NAME}" =~ ^certified ]] ; then + cat_enables+=" MENUSELECT_BRIDGES MENUSELECT_CEL MENUSELECT_CDR" + cat_enables+=" MENUSELECT_CHANNELS MENUSELECT_CODECS MENUSELECT_FORMATS MENUSELECT_FUNCS" + cat_enables+=" MENUSELECT_PBX MENUSELECT_RES MENUSELECT_UTILS" + else + mod_disables+="test_utils" + fi + runner menuselect/menuselect `gen_cats enable $cat_enables` menuselect.makeopts - mod_disables="res_digium_phone chan_vpb" + mod_disables+=" res_digium_phone chan_vpb" if [ $TESTED_ONLY -eq 1 ] ; then # These modules are not tested at all. They are loaded but nothing is ever done # with them, no testsuite tests depend on them.