Fix stratum-related jenkins job failing
Change-Id: Ide032cfe8d93529f266d2cba3435f75920c96877
diff --git a/tools/dev/p4vm/install-p4-tools.sh b/tools/dev/p4vm/install-p4-tools.sh
index b124751..a4abd16 100755
--- a/tools/dev/p4vm/install-p4-tools.sh
+++ b/tools/dev/p4vm/install-p4-tools.sh
@@ -19,8 +19,8 @@
set -e
set -x
-BMV2_COMMIT="99d83115d498f0ebcc729dad4fa4c50577eccc81"
-PI_COMMIT="f9a5c6c74f7dcde382e27c63af2fe5dffc755364"
+BMV2_COMMIT="10c2d3434a7212631f11d5d1e3bc802ba6365f6a"
+PI_COMMIT="0bcaeda2269a4f2f0539cf8eac49868e389a8c18"
P4C_COMMIT="e2934ab32ace8a877bf2b34704950a4da69b6202"
# p4c seems to break when using protobuf versions newer than 3.2.0
diff --git a/tools/test/bin/stratum-stc-cell-side b/tools/test/bin/stratum-stc-cell-side
index 5ab945b..4cdd8a6 100755
--- a/tools/test/bin/stratum-stc-cell-side
+++ b/tools/test/bin/stratum-stc-cell-side
@@ -4,7 +4,7 @@
USE_STRATUM=true DEBUG_FLAGS=false FAST_BUILD=true CLEAN_UP=true bash /tmp/install-p4-tools.sh
# install bazel
-BAZEL_VERSION="0.20.0"
+BAZEL_VERSION="0.23.2"
curl -L -o bazel.sh -s https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
chmod +x bazel.sh
./bazel.sh --user
@@ -19,7 +19,7 @@
export BMV2_INSTALL=/usr/local
# build stratum
-bazel build //stratum/hal/bin/bmv2:stratum_bmv2 --incompatible_remove_native_http_archive=false
+bazel build //stratum/hal/bin/bmv2:stratum_bmv2
# deploy stratum binaries to where mininet will look for them
mkdir -p /home/sdn/stratum/bazel-bin/stratum/hal/bin/bmv2