From 9ee4a123ed5faebc5f795e2c88c8e1e5ea6947ac Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Thu, 1 Dec 2016 16:26:17 -0600 Subject: Put in check to make sure the patch is rebased late enough Change-Id: Ia32ad82a3d8ee91282b26f70b4728e252e7453fd Signed-off-by: Ed Warnicke --- jjb/vpp/include-raw-vpp-build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh index 55fadd0d5..2b56eb454 100644 --- a/jjb/vpp/include-raw-vpp-build.sh +++ b/jjb/vpp/include-raw-vpp-build.sh @@ -34,6 +34,11 @@ sha1sum $0 (git log --oneline | grep 30d41ff > /dev/null 2>&1);if [ $? != 0 ]; then REBASE_NEEDED="1";fi (git log --oneline | grep fb0815d > /dev/null 2>&1);if [ $? == 0 ]; then VPP_REPO="1";fi + +# Due to a shift to make verify, after 2016-12-01 we need to make sure any patches +# coming in happen after 37682e1 +(git log --oneline | grep 37682e1 > /dev/null 2>&1);if [ $? != 0 ]; then REBASE_NEEDED="1";fi + echo "REBASE_NEEDED: ${REBASE_NEEDED}" echo "VPP_REPO: ${VPP_REPO}" -- cgit 1.2.3-korg