Remove kafka-onos from TOST builds
Change-Id: I3914f4a97027023fed2d2da1530ff74a35ba3a18
diff --git a/.gitignore b/.gitignore
index 978c440..3cb149b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@
trellis-control/
trellis-t3/
up4/
-kafka-onos/
fabric-tna/
.m2/
mvn_settings.xml
diff --git a/Dockerfile.tost b/Dockerfile.tost
index 609d85d..8fb06eb 100644
--- a/Dockerfile.tost
+++ b/Dockerfile.tost
@@ -71,7 +71,6 @@
ARG org_onosproject_trellis_control_version=unknown
ARG org_onosproject_trellis_t3_version=unknown
ARG org_omecproject_up4_version=unknown
-ARG org_opencord_kafka_onos_version=unknown
ARG org_stratumproject_fabric_tna_version=unknown
LABEL org.label-schema.schema-version=1.0 \
@@ -84,5 +83,4 @@
org.onosproject.trellis-control.version=$org_onosproject_trellis_control_version \
org.onosproject.trellis-t3.version=$org_onosproject_trellis_t3_version \
org.omecproject.up4.version=$org_omecproject_up4_version \
- org.opencord.kafka-onos.version=$org_opencord_kafka_onos_version \
org.stratumproject.fabric-tna.version=$org_stratumproject_fabric_tna_version
diff --git a/Makefile b/Makefile
index fe0d932..b20e824 100644
--- a/Makefile
+++ b/Makefile
@@ -76,15 +76,11 @@
export UP4_ROOT := $(shell pwd)/up4
export UP4_REPO := git@github.com:omec-project/up4.git
-# Kafka-onos related
-export KAFKA_ONOS_ROOT := $(shell pwd)/kafka-onos
-export KAFKA_ONOS_REPO := https://gerrit.opencord.org/kafka-onos
-
# Fabric-TNA related
export FABRIC_TNA_ROOT := $(shell pwd)/fabric-tna
export FABRIC_TNA_REPO := git@github.com:stratum/fabric-tna.git
-.PHONY: onos trellis-control trellis-t3 up4 kafka-onos fabric-tna
+.PHONY: onos trellis-control trellis-t3 up4 fabric-tna
.SILENT: up4 fabric-tna
@@ -101,7 +97,6 @@
@echo "TRELLIS_CONTROL_VERSION : Override to use a specific branch/commit/tag/release to build the image"
@echo "TRELLIS_T3_VERSION : Override to use a specific branch/commit/tag/release to build the image"
@echo "UP4_VERSION : Override to use a specific branch/commit/tag/release to build the image"
- @echo "KAFKA_ONOS_VERSION : Override to use a specific branch/commit/tag/release to build the image"
@echo "FABRIC_TNA_VERSION : Override to use a specific branch/commit/tag/release to build the image"
@echo ""
@echo "'Makefile.vars.stable' defines the stable values for '*_VERSION' variables".
@@ -191,28 +186,6 @@
up4-build: mvn_settings.xml local-apps up4 ## : Builds up4 using local app
@./app-build.sh $@
-kafka-onos: ## : Checkout kafka-onos code
- if [ ! -d "kafka-onos" ]; then \
- git clone ${KAFKA_ONOS_REPO}; \
- fi
-
- @modified=$$(cd ${KAFKA_ONOS_ROOT} && git status --porcelain); \
- if [ ! -z "$${modified}" ]; then \
- echo "Unable to checkout, you have pending changes in kafka-onos repository"; \
- exit 1; \
- fi
-
- cd ${KAFKA_ONOS_ROOT} && git remote update
-
- if ! (cd ${KAFKA_ONOS_ROOT} && (git checkout origin/${KAFKA_ONOS_VERSION} || git checkout ${KAFKA_ONOS_VERSION})); then \
- if ! (cd ${KAFKA_ONOS_ROOT} && git fetch ${KAFKA_ONOS_REPO} ${KAFKA_ONOS_VERSION} && git checkout FETCH_HEAD); then \
- echo "Unable to fetch the changes from the kafka-onos repository"; \
- fi \
- fi
-
-kafka-onos-build: mvn_settings.xml local-apps kafka-onos ## : Builds kafka-onos using local app or mvn
- @./app-build.sh $@
-
fabric-tna: ## : Checkout fabric-tna code
if [ ! -d "fabric-tna" ]; then \
git clone ${FABRIC_TNA_REPO}; \
@@ -236,9 +209,9 @@
fabric-tna-build: mvn_settings.xml local-apps fabric-tna ## : Builds fabric-tna using local app
@./app-build.sh $@
-apps: trellis-control trellis-t3 up4 kafka-onos fabric-tna ## : downloads commits, files, and refs from remotes
+apps: trellis-control trellis-t3 up4 fabric-tna ## : downloads commits, files, and refs from remotes
-apps-build: trellis-control-build trellis-t3-build up4-build kafka-onos-build fabric-tna-build ## : Build the onos apps
+apps-build: trellis-control-build trellis-t3-build up4-build fabric-tna-build ## : Build the onos apps
onos: ## : Checkout onos code
if [ ! -d "onos" ]; then \
@@ -282,7 +255,6 @@
--build-arg org_onosproject_trellis_control_version="$(shell cd ${TRELLIS_CONTROL_ROOT} && git rev-parse HEAD)"\
--build-arg org_onosproject_trellis_t3_version="$(shell cd ${TRELLIS_T3_ROOT} && git rev-parse HEAD)"\
--build-arg org_omecproject_up4_version="$(shell cd ${UP4_ROOT} && git rev-parse HEAD)"\
- --build-arg org_opencord_kafka_onos_version="$(shell cd ${KAFKA_ONOS_ROOT} && git rev-parse HEAD)"\
--build-arg org_stratumproject_fabric_tna_version="$(shell cd ${FABRIC_TNA_ROOT} && git rev-parse HEAD)"\
-f Dockerfile.tost .
@@ -303,7 +275,6 @@
rm -rf ${TRELLIS_CONTROL_ROOT}
rm -rf ${TRELLIS_T3_ROOT}
rm -rf ${UP4_ROOT}
- rm -rf ${KAFKA_ONOS_ROOT}
rm -rf ${FABRIC_TNA_ROOT}
rm -rf ${LOCAL_APPS}
rm -rf .m2
diff --git a/Makefile.vars.master b/Makefile.vars.master
index 93d8033..8a11652 100644
--- a/Makefile.vars.master
+++ b/Makefile.vars.master
@@ -30,5 +30,4 @@
export TRELLIS_CONTROL_VERSION ?= 3.0.1-SNAPSHOT
export TRELLIS_T3_VERSION ?= 4.0.0-SNAPSHOT
export UP4_VERSION ?= master
-export KAFKA_ONOS_VERSION ?= 2.6.0-SNAPSHOT
export FABRIC_TNA_VERSION ?= main
diff --git a/Makefile.vars.stable b/Makefile.vars.stable
index c8c5bd1..828db5c 100644
--- a/Makefile.vars.stable
+++ b/Makefile.vars.stable
@@ -30,5 +30,4 @@
export TRELLIS_CONTROL_VERSION ?= a3989be6892ec25e99a2caf7b63ea4226dfda39d
export TRELLIS_T3_VERSION ?= 4fd3b46d76d1738c3d69d5fdc56603ac77fbfdc0
export UP4_VERSION ?= 9c1d8a29c905eeafb1e5fba71ecd8434fec255e1
-export KAFKA_ONOS_VERSION ?= 2.5.0
export FABRIC_TNA_VERSION ?= 3523df3f8392a40c4cc837300e00fcf788403d82
diff --git a/README.md b/README.md
index 7a02cad..28d4145 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@
make ONOS_VERSION=ref/changes/72/12345/1 onos-build
```
-Makefile will build also the apps. These are the apps currently integrated in the script: **trellis-control**, **trellis-t3**, **up4**, **kafka-onos** and **fabric-tna**. For each one, there is a **build** target.
+Makefile will build also the apps. These are the apps currently integrated in the script: **trellis-control**, **trellis-t3**, **up4** and **fabric-tna**. For each one, there is a **build** target.
`appname-build` builds with the version specified in the `Makefile.vars.DOCKER_TAG`, using the following sources in order: (1) Maven central (for released versions or snapshots); (2) Local source code (for local branch not yet pushed); (3) Gerrit/Github (for pending review in the form of refs/changes/... or pending pull request). As a prerequisite, the script prepares `mvn_settings.xml` file, creates the `local-apps` folder and checks out the code if it is not present (relies on `appname` target). **APPNAME_VERSION**, defined in `Makefile.vars.DOCKER_TAG` file, can be overridden at runtime.
diff --git a/app-build.sh b/app-build.sh
index 038313b..a94146f 100755
--- a/app-build.sh
+++ b/app-build.sh
@@ -49,12 +49,6 @@
UP4_TARGETS=_prepare_app_build
UP4_OAR=${UP4_ROOT}/app/app/target/${UP4_ARTIFACTID}-${UP4_VERSION}.oar
-# Kafka-onos related vars
-KAFKA_ONOS_GROUPID=org.opencord
-KAFKA_ONOS_ARTIFACTID=kafka
-KAFKA_ONOS_ARTIFACT=${KAFKA_ONOS_GROUPID}:${KAFKA_ONOS_ARTIFACTID}
-KAFKA_ONOS_OAR=${KAFKA_ONOS_ROOT}/target/${KAFKA_ONOS_ARTIFACTID}-${KAFKA_ONOS_VERSION}.oar
-
# Fabric-tna related vars
FABRIC_TNA_GROUPID=org.stratumproject
FABRIC_TNA_ARTIFACTID=fabric-tna
@@ -170,18 +164,6 @@
cp "${UP4_OAR}" "${LOCAL_APPS}"/
}
-function kafka-onos-build {
- build_app "${KAFKA_ONOS_ROOT}"/target \
- "${KAFKA_ONOS_ROOT}"/ "kafka-onos" \
- "${KAFKA_ONOS_ARTIFACT}" "${KAFKA_ONOS_VERSION}" \
- "target" "${KAFKA_ONOS_OAR}" "${KAFKA_ONOS_REPO}"
- if [ "$MVN" -eq "0" ]; then
- extract_version "${KAFKA_ONOS_ROOT}"
- KAFKA_ONOS_OAR="${KAFKA_ONOS_ROOT}"/target/"${KAFKA_ONOS_ARTIFACTID}"-"${PROJECT_VERSION}".oar
- fi
- cp "${KAFKA_ONOS_OAR}" "${LOCAL_APPS}"/
-}
-
function fabric-tna-build {
# This workaround is temporary - typically we need to build only the pipeconf
cd "${FABRIC_TNA_ROOT}" || exit 1 && make "${FABRIC_TNA_TARGETS[@]}"