From: Ed Warnicke Date: Fri, 2 Dec 2016 16:30:36 +0000 (+0000) Subject: Revert "Put in check to make sure the patch is rebased late enough" X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=refs%2Fchanges%2F78%2F4078%2F2;hp=70b79552015d4b4c00056a39467f3a7c32378a8b;p=ci-management.git Revert "Put in check to make sure the patch is rebased late enough" This reverts gerrit https://gerrit.fd.io/r/#/c/4061/ This reverts commit 9ee4a123ed5faebc5f795e2c88c8e1e5ea6947ac. Change-Id: I3bdeb6b0be6ea4013995b11ea626b03a04bb5069 Signed-off-by: Ed Warnicke --- diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh index 2b56eb454..55fadd0d5 100644 --- a/jjb/vpp/include-raw-vpp-build.sh +++ b/jjb/vpp/include-raw-vpp-build.sh @@ -34,11 +34,6 @@ 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}"