From patchwork Mon Mar 9 14:40:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 1251581 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48bgqp47hNz9sPg for ; Tue, 10 Mar 2020 01:40:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E7F7D881EB; Mon, 9 Mar 2020 14:40:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qmDCjbhTYVhE; Mon, 9 Mar 2020 14:40:19 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 81F0C881C4; Mon, 9 Mar 2020 14:40:19 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 580D8C18D3; Mon, 9 Mar 2020 14:40:19 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6BF4DC0177 for ; Mon, 9 Mar 2020 14:40:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5B45A861B2 for ; Mon, 9 Mar 2020 14:40:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gqOKpBgp4a6m for ; Mon, 9 Mar 2020 14:40:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 4B9D786155 for ; Mon, 9 Mar 2020 14:40:16 +0000 (UTC) Received: from im-t490s.redhat.com (nat-pool-brq-t.redhat.com [213.175.37.10]) (Authenticated sender: i.maximets@ovn.org) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 0591D10000B; Mon, 9 Mar 2020 14:40:12 +0000 (UTC) From: Ilya Maximets To: ovs-dev@openvswitch.org Date: Mon, 9 Mar 2020 15:40:07 +0100 Message-Id: <20200309144007.261265-1-i.maximets@ovn.org> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Cc: Ilya Maximets Subject: [ovs-dev] [PATCH] travis: Fix using DPDK build from master branch cache. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" 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 Acked-by: David Marchand Acked-by: Aaron Conole --- .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()