Add int targets to fabric-tna build and update components version

Change-Id: I57f53170dedd42579e01a8c20c4f0b77d5aca0e0
diff --git a/Makefile.vars b/Makefile.vars
index 1cec64e..dc26e72 100644
--- a/Makefile.vars
+++ b/Makefile.vars
@@ -27,9 +27,9 @@
 # (3) Fetch from Gerrit/Github (pending review in the form of refs/changes/... or pending pull request);
 
 export ONOS_VERSION            ?= 2.2.4
-export TRELLIS_CONTROL_VERSION ?= 3.0.0-SNAPSHOT
-export TRELLIS_T3_VERSION      ?= 3.0.0-SNAPSHOT
+export TRELLIS_CONTROL_VERSION ?= 3.0.0
+export TRELLIS_T3_VERSION      ?= 3.0.0
 export FABRIC_TOFINO_VERSION   ?= e1cf4551b4ab74bb82a7cecf19d197698ffbc1cb
 export UP4_VERSION             ?= cac4b02ef342a0588bc3e1fcfb8d29fef1c0dfd8
 export KAFKA_ONOS_VERSION      ?= 2.4.0-SNAPSHOT
-export FABRIC_TNA_VERSION      ?= 222ad5e2e432b0d7dcc05846fe3fa3485dd520c4
+export FABRIC_TNA_VERSION      ?= 8816a14ff7b5c0e6ab4930902f304fe25cfe616e
diff --git a/app-build.sh b/app-build.sh
index 6a616ba..a14ff85 100755
--- a/app-build.sh
+++ b/app-build.sh
@@ -68,7 +68,7 @@
 FABRIC_TNA_GROUPID=org.stratumproject
 FABRIC_TNA_ARTIFACTID=fabric-tna
 FABRIC_TNA_ARTIFACT=${FABRIC_TNA_GROUPID}:${FABRIC_TNA_ARTIFACTID}
-FABRIC_TNA_TARGETS=(fabric fabric-spgw)
+FABRIC_TNA_TARGETS=(fabric fabric-spgw fabric-int fabric-spgw-int)
 FABRIC_TNA_SDE_DOCKER_IMG=opennetworking/bf-sde:9.2.0-p4c
 FABRIC_TNA_OAR=${FABRIC_TNA_ROOT}/target/${FABRIC_TNA_ARTIFACTID}-${FABRIC_TNA_VERSION}.oar