On 3/11/20 6:06 PM, Aaron Conole wrote: > Ilya Maximets <[email protected]> writes: > >> On 3/11/20 4:13 PM, Aaron Conole wrote: >>> Ilya Maximets <[email protected]> writes: >>> >>>> 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]> >>>> --- >>> >>> Does it make sense to remove the .config file before stamping the >>> version instead? I guess either way will accomplish what you're after. >> >> How this supposed to help? We're no building DPDK at all if version >> file matches. Am I missing something? > > Oops. I misread the install_dpdk() function. > >> It might make sense to prepare dpdk config file and check if it's >> equal to the config file in the cache. But this sounds too complex. > > See below. > >>> I don't see much difference between them, and I guess it is just a >>> different color for the bike shed, so: >>> >>> Acked-by: Aaron Conole <[email protected]> >>> >>> On this note, I've set the bot to also rebuild it's master branch >>> every Sunday (which should help with each series build time). >> >> But with this patch applied series_* branches will not be able to use >> cache from the master. > > Hrrm... I'd prefer a solution that doesn't have this side effect. Maybe > it's possible to do this in an alternative fashion (like comparing > .config files mentioned above in addition to the existing version number > check)? That way we can preserve the per-branch settings, and also let > the bot take advantage of the weekly master-branch build for dpdk > builds. It should still be pulling the cache for the non-dpdk builds, > so it's still useful for that (the ENV settings will match). >
OK. For now I cleared cache on master branch and pushed one new commit in a branch backward order, so branch-2.13 will build it's own cache and work fine after that until the new cache clearing which is unlikely. Meanwhile, I'll work on config checking solution. Best regards, Ilya Maximets. _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
