On Mon, Mar 9, 2020 at 3:40 PM Ilya Maximets <[email protected]> wrote: > > If no cache available for current branch, Travis CI uses cache from > the default (master) branch. This causes build failures on older > OVS branches if cache was cleared because DPDK builds from master > branch are not compatible. > > For example, we removed pdump support on master, but branch 2.13 > explicitly requests pdump being enabled and fails while using > cached DPDK from the master branch. > > Adding the branch name to the version file to avoid using incompatible > DPDK builds. > > Signed-off-by: Ilya Maximets <[email protected]> > --- > .travis/linux-build.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh > index 359f7773b..dbaabaa60 100755 > --- a/.travis/linux-build.sh > +++ b/.travis/linux-build.sh > @@ -98,7 +98,7 @@ function install_dpdk() > else > if [ -f "${VERSION_FILE}" ]; then > VER=$(cat ${VERSION_FILE}) > - if [ "${VER}" = "${DPDK_VER}" ]; then > + if [ "${VER}" = "${DPDK_VER}-${TRAVIS_BRANCH}" ]; then > EXTRA_OPTS="${EXTRA_OPTS} --with-dpdk=$(pwd)/dpdk-dir/build" > echo "Found cached DPDK ${VER} build in $(pwd)/dpdk-dir" > return > @@ -128,7 +128,7 @@ function install_dpdk() > EXTRA_OPTS="$EXTRA_OPTS --with-dpdk=$(pwd)/build" > echo "Installed DPDK source in $(pwd)" > popd > - echo "${DPDK_VER}" > ${VERSION_FILE} > + echo "${DPDK_VER}-${TRAVIS_BRANCH}" > ${VERSION_FILE} > } > > function configure_ovs()
Having a bit of trouble to parse the commit title. How about: travis: Fix DPDK cache for non master branches. Anyway, the fix lgtm. Acked-by: David Marchand <[email protected]> -- David Marchand _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
