From 6128407e748e995340888140812901b40752a0e1 Mon Sep 17 00:00:00 2001 From: Joseph Grogan Date: Tue, 17 Dec 2024 12:34:40 -0500 Subject: [PATCH] Fix integration target --- Makefile | 24 ++++++++++++++---------- README.md | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index f0a9ea13..7a008353 100644 --- a/Makefile +++ b/Makefile @@ -9,15 +9,6 @@ build: bounce: build undeploy deploy deploy-samples deploy-config deploy-demo -# Integration tests expect K8s, Kafka, and Venice to be running -integration-tests: deploy-kafka deploy-venice deploy-samples - kubectl wait kafka.kafka.strimzi.io/one --for=condition=Ready --timeout=10m -n kafka - kubectl wait kafkatopic.kafka.strimzi.io/existing-topic-1 --for=condition=Ready --timeout=10m -n kafka - kubectl wait kafkatopic.kafka.strimzi.io/existing-topic-2 --for=condition=Ready --timeout=10m -n kafka - kubectl port-forward -n kafka svc/one-kafka-external-0 9092 & echo $$! > port-forward.pid - ./gradlew intTest || kill `cat port-forward.pid` - kill `cat port-forward.pid` - clean: ./gradlew clean @@ -98,6 +89,19 @@ undeploy-venice: kubectl delete -f ./deploy/samples/venicedb.yaml || echo "skipping" docker compose -f ./deploy/docker/docker-compose-single-dc-setup.yaml down +deploy-dev-environment: deploy deploy-flink deploy-kafka deploy-venice + +undeploy-dev-environment: undeploy-venice undeploy-kafka undeploy-flink undeploy + +# Integration tests expect K8s, Kafka, and Venice to be running +integration-tests: deploy-dev-environment + kubectl wait kafka.kafka.strimzi.io/one --for=condition=Ready --timeout=10m -n kafka + kubectl wait kafkatopic.kafka.strimzi.io/existing-topic-1 --for=condition=Ready --timeout=10m -n kafka + kubectl wait kafkatopic.kafka.strimzi.io/existing-topic-2 --for=condition=Ready --timeout=10m -n kafka + kubectl port-forward -n kafka svc/one-kafka-external-0 9092 & echo $$! > port-forward.pid + ./gradlew intTest || kill `cat port-forward.pid` + kill `cat port-forward.pid` + generate-models: ./generate-models.sh ./hoptimator-models/generate-models.sh # <-- marked for deletion @@ -106,4 +110,4 @@ release: test -n "$(VERSION)" # MISSING ARG: $$VERSION ./gradlew publish -.PHONY: install build bounce integration-tests clean quickstart deploy-config undeploy-config deploy undeploy deploy-demo undeploy-demo deploy-samples undeploy-samples deploy-flink undeploy-flink deploy-kafka undeploy-kafka deploy-venice undeploy-venice generate-models release +.PHONY: install build bounce clean quickstart deploy-config undeploy-config deploy undeploy deploy-demo undeploy-demo deploy-samples undeploy-samples deploy-flink undeploy-flink deploy-kafka undeploy-kafka deploy-venice undeploy-venice integration-tests deploy-dev-environment undeploy-dev-environment generate-models release diff --git a/README.md b/README.md index bb25e84a..b2284a5d 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ The below setup will install a Kafka and Flink cluster within Kubernetes. ``` $ make install # build and install SQL CLI - $ make deploy-dev-environment # start local Kafka & Flink setups + $ make deploy-dev-environment # start all local dev setups $ kubectl port-forward -n kafka svc/one-kafka-external-0 9092 & # forward external Kafka port for use by SQL CLI $ ./hoptimator # start the SQL CLI > !intro