-if [ ${STREAM} == 'master' ]; then
- ./resources/tools/scripts/download_hc_build_pkgs.sh ${STREAM} ${OS}
-else
+if [[ "1807 1810 1901" =~ .*$STREAM.* ]]; then
+ # add stable prefix for branches which have older version of package download script
+ # This can be removed when support for 1901 branch ends.
+ if [[ -n "${jvpp_commit_id}" ]]; then
+ echo "Error: Specifying jvpp custom commit is not supported for 1807,1810,1901 stable branches"
+ exit 1
+ fi