summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorEd Warnicke <hagbard@gmail.com>2016-12-02 16:30:36 +0000
committerEd Warnicke <hagbard@gmail.com>2016-12-02 16:32:20 +0000
commit41d220f1ce14bef23a14e5b6ab0924f3dcafcdb7 (patch)
tree593fdd21238b1d33dcc33953cf3c4560add52368 /jjb
parent70b79552015d4b4c00056a39467f3a7c32378a8b (diff)
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 <eaw@cisco.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/vpp/include-raw-vpp-build.sh5
1 files changed, 0 insertions, 5 deletions
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}"