Build fabric-tna based on sr-api
Also update trellis-control artifact name
ref: https://gerrit.onosproject.org/c/trellis-control/+/23917
Change-Id: I12b6318479716081ddd2e28e0400a965e8616738
diff --git a/Makefile.vars b/Makefile.vars
index eebe099..1cec64e 100644
--- a/Makefile.vars
+++ b/Makefile.vars
@@ -32,4 +32,4 @@
export FABRIC_TOFINO_VERSION ?= e1cf4551b4ab74bb82a7cecf19d197698ffbc1cb
export UP4_VERSION ?= cac4b02ef342a0588bc3e1fcfb8d29fef1c0dfd8
export KAFKA_ONOS_VERSION ?= 2.4.0-SNAPSHOT
-export FABRIC_TNA_VERSION ?= da091c3445f81fc69a67acf5d1e37be715f5c052
+export FABRIC_TNA_VERSION ?= 222ad5e2e432b0d7dcc05846fe3fa3485dd520c4
diff --git a/app-build.sh b/app-build.sh
index 3a91545..6a616ba 100755
--- a/app-build.sh
+++ b/app-build.sh
@@ -32,9 +32,9 @@
# Trellis-control related vars
TRELLIS_CONTROL_GROUPID=org.onosproject
-TRELLIS_CONTROL_ARTIFACTID=segmentrouting-oar
+TRELLIS_CONTROL_ARTIFACTID=segmentrouting-app
TRELLIS_CONTROL_ARTIFACT=${TRELLIS_CONTROL_GROUPID}:${TRELLIS_CONTROL_ARTIFACTID}
-TRELLIS_CONTROL_OAR=${TRELLIS_CONTROL_ROOT}/oar/target/${TRELLIS_CONTROL_ARTIFACTID}-${TRELLIS_CONTROL_VERSION}.oar
+TRELLIS_CONTROL_OAR=${TRELLIS_CONTROL_ROOT}/app/target/${TRELLIS_CONTROL_ARTIFACTID}-${TRELLIS_CONTROL_VERSION}.oar
# Trellis-t3 related vars
TRELLIS_T3_GROUPID=org.onosproject
@@ -137,16 +137,16 @@
function trellis-control-build {
# Build function
- build_app "${TRELLIS_CONTROL_ROOT}"/oar/target \
+ build_app "${TRELLIS_CONTROL_ROOT}"/app/target \
"${TRELLIS_CONTROL_ROOT}"/ "trellis-control" \
"${TRELLIS_CONTROL_ARTIFACT}" "${TRELLIS_CONTROL_VERSION}" \
- "oar/target" "${TRELLIS_CONTROL_OAR}" "${TRELLIS_CONTROL_REPO}"
+ "app/target" "${TRELLIS_CONTROL_OAR}" "${TRELLIS_CONTROL_REPO}"
# If MVN was not successful - built from sources
if [ "$MVN" -eq "0" ]; then
# Update VERSION
extract_version "${TRELLIS_CONTROL_ROOT}"
# Update OAR
- TRELLIS_CONTROL_OAR="${TRELLIS_CONTROL_ROOT}"/oar/target/"${TRELLIS_CONTROL_ARTIFACTID}"-"${PROJECT_VERSION}".oar
+ TRELLIS_CONTROL_OAR="${TRELLIS_CONTROL_ROOT}"/app/target/"${TRELLIS_CONTROL_ARTIFACTID}"-"${PROJECT_VERSION}".oar
fi
# Final step requires to move the oar to the folder used by the tost docker file. Moreover, it will help catch up errors
cp "${TRELLIS_CONTROL_OAR}" "${LOCAL_APPS}"/