Update tost-onos to match the latest updates
Change-Id: I5f371e612f088dca3743ab439841e8899c5b2f57
diff --git a/Makefile.vars.master b/Makefile.vars.master
index e79841a..58ab187 100644
--- a/Makefile.vars.master
+++ b/Makefile.vars.master
@@ -26,7 +26,7 @@
# (2) Checkout Local source code (local branch not yet pushed);
# (3) Fetch from Gerrit/Github (pending review in the form of refs/changes/... or pending pull request);
-export ONOS_VERSION ?= master
+export ONOS_VERSION ?= onos-2.5
export TRELLIS_CONTROL_VERSION ?= 3.0.1-SNAPSHOT
export TRELLIS_T3_VERSION ?= 4.0.0-SNAPSHOT
export FABRIC_TOFINO_VERSION ?= master
diff --git a/Makefile.vars.stable b/Makefile.vars.stable
index a2b5274..04f4601 100644
--- a/Makefile.vars.stable
+++ b/Makefile.vars.stable
@@ -26,10 +26,10 @@
# (2) Checkout Local source code (local branch not yet pushed);
# (3) Fetch from Gerrit/Github (pending review in the form of refs/changes/... or pending pull request);
-export ONOS_VERSION ?= 2.2.7-b3
-export TRELLIS_CONTROL_VERSION ?= 3.0.0
-export TRELLIS_T3_VERSION ?= 3.0.0
+export ONOS_VERSION ?= 2.5.1
+export TRELLIS_CONTROL_VERSION ?= a3989be6892ec25e99a2caf7b63ea4226dfda39d
+export TRELLIS_T3_VERSION ?= 4fd3b46d76d1738c3d69d5fdc56603ac77fbfdc0
export FABRIC_TOFINO_VERSION ?= e1cf4551b4ab74bb82a7cecf19d197698ffbc1cb
export UP4_VERSION ?= 61ba80779a0f38f43da05dea9a124955a596841f
-export KAFKA_ONOS_VERSION ?= 2.4.0
-export FABRIC_TNA_VERSION ?= ba6f153f72045b1af84265b954271704857bf007
+export KAFKA_ONOS_VERSION ?= 2.5.0
+export FABRIC_TNA_VERSION ?= bb46f389ce3800a94c0cf6d5ce5f1a86e97e286f