commit 4766027014c4d6b5eeab2b76e7f77dc87828c45e
author SeanCondon <sean.condon@intel.com> Sun Jan 15 22:24:24 2023 +0000
committer SeanCondon <sean.condon@intel.com> Sun Jan 15 22:28:44 2023 +0000
tree 34f987fd1751b800476764c7b128f5bde3b97e68
parent e184e6ebd67496f0d46a6caeb3c965f9af1e9415

fixing Make file for aether 2.0 and older

Change-Id: I339d8cd3b39493973ce681345d299e02f7366a32

Makefile

diff --git a/Makefile b/Makefile
index 93e471c..918a5a4 100644
--- a/Makefile
+++ b/Makefile
@@ -487,10 +487,12 @@
 	echo "ONOS CLI pod: ${ONOS_CLI_POD}"
 	@$(eval API_SERVICE := $(shell kubectl -n aether-roc get --no-headers=true services -l app.kubernetes.io/name=aether-roc-api | awk '{print $$1}'))
 	echo "API SERVICE : ${API_SERVICE}"
-	until kubectl -n aether-roc exec ${ONOS_CLI_POD} -- \
-		curl -s -f -L -X PATCH "http://${API_SERVICE}:8181/aether-roc-api" \
-		--header 'Content-Type: application/json' \
-		--data-raw "$$(cat ${ROC_DEFAULTENT_MODEL})"; do sleep 5; done
+	if [ "$(CHARTS)" != "release-2.0" -a "$(CHARTS)" != "release-1.6" ]; then \
+        until kubectl -n aether-roc exec ${ONOS_CLI_POD} -- \
+            curl -s -f -L -X PATCH "http://${API_SERVICE}:8181/aether-roc-api" \
+            --header 'Content-Type: application/json' \
+            --data-raw "$$(cat ${ROC_DEFAULTENT_MODEL})"; do sleep 5; done; \
+	fi
 	until kubectl -n aether-roc exec ${ONOS_CLI_POD} -- \
 		curl -s -f -L -X PATCH "http://${API_SERVICE}:8181/aether-roc-api" \
 		--header 'Content-Type: application/json' \
@@ -509,10 +511,12 @@
 	echo "ONOS CLI pod: ${ONOS_CLI_POD}"
 	@$(eval API_SERVICE := $(shell kubectl -n aether-roc get --no-headers=true services -l app.kubernetes.io/name=aether-roc-api | awk '{print $$1}'))
 	echo "API SERVICE : ${API_SERVICE}"
-	until kubectl -n aether-roc exec ${ONOS_CLI_POD} -- \
-		curl -s -f -L -X PATCH "http://${API_SERVICE}:8181/aether-roc-api" \
-		--header 'Content-Type: application/json' \
-		--data-raw "$$(cat ${ROC_DEFAULTENT_MODEL})"; do sleep 5; done
+	if [ "$(CHARTS)" != "release-2.0" -a "$(CHARTS)" != "release-1.6" ]; then \
+        until kubectl -n aether-roc exec ${ONOS_CLI_POD} -- \
+            curl -s -f -L -X PATCH "http://${API_SERVICE}:8181/aether-roc-api" \
+            --header 'Content-Type: application/json' \
+            --data-raw "$$(cat ${ROC_DEFAULTENT_MODEL})"; do sleep 5; done; \
+	fi
 	until kubectl -n aether-roc exec ${ONOS_CLI_POD} -- \
 		curl -s -f -L -X PATCH "http://${API_SERVICE}:8181/aether-roc-api" \
 		--header 'Content-Type: application/json' \