test: improve e2e workspace

.github/workflows/ci.yml

@@ -99,7 +99,7 @@ jobs:
         run: rustup target add wasm32-wasi
       - name: Run Integration Test
         timeout-minutes: 30
-        run: make integration_tests
+        run: START_FLUVIO=false make integration_tests
 
   done:
     name: Done

Cargo.toml

@@ -2,8 +2,8 @@
 members = [
     "crates/sql-sink",
     "crates/fluvio-model-sql",
-    "crates/integration-tests",
     "crates/json-sql",
+    "tests/integration",
 ]
 resolver = "2"
 
@@ -12,7 +12,15 @@ inherits = "release"
 lto = true
 
 [workspace.dependencies]
-fluvio = { git = "https://github.com/infinyon/fluvio", branch = "fix_shutdown_cdk" }
-fluvio-connector-common = { git = "https://github.com/infinyon/fluvio", branch = "fix_shutdown_cdk" }
+fluvio = { git = "https://github.com/infinyon/fluvio", branch = "master" }
+fluvio-connector-common = { git = "https://github.com/infinyon/fluvio", branch = "master" }
 fluvio-future = "0.7.0"
-fluvio-smartmodule = { git = "https://github.com/infinyon/fluvio", branch = "fix_shutdown_cdk" }
+fluvio-smartmodule = { git = "https://github.com/infinyon/fluvio", branch = "master" }
+
+
+# fluvio = { path = "../../fluvio/crates/fluvio/" }
+# fluvio-connector-common = { path = "../../fluvio/crates/fluvio-connector-common/" }
+# fluvio-smartmodule = { path = "../../fluvio/crates/fluvio-smartmodule/" }
+
+# Internal dependencies
+fluvio-model-sql = { path = "crates/fluvio-model-sql" }

Makefile

@@ -1,6 +1,14 @@
-integration_tests:
-	cdk build -p sql-sink
-	smdk build -p json-sql
-	smdk load -p json-sql
-	RUST_LOG=warn,integration_tests=info cargo run --release -p integration-tests
+# Default paths to binaries
+BINARIES_PATH?=
+FLUVIO_BIN?=$(BINARIES_PATH)fluvio
+SMDK_BIN?=$(BINARIES_PATH)smdk
+CDK_BIN?=$(BINARIES_PATH)cdk
+START_FLUVIO?=true
 
+# Integration tests target
+integration_tests:
+	$(CDK_BIN) build -p sql-sink
+	$(SMDK_BIN) build -p json-sql
+	FLUVIO_BIN=$(FLUVIO_BIN) CDK_BIN=$(CDK_BIN) SMDK_BIN=$(SMDK_BIN) \
+		   START_FLUVIO=$(START_FLUVIO) RUST_LOG=warn,integration_tests=info \
+		   cargo run --release -p integration-tests