use operator.yaml from sonataflow-operator

treblereel · Dec 23, 2024 · 436d693 · 436d693
1 parent 1b2e3e8
commit 436d693
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/packages/kn-plugin-workflow/Makefile b/packages/kn-plugin-workflow/Makefile
@@ -71,12 +71,8 @@ test-e2e:
 	@$(MAKE) create-cluster
 	@$(MAKE) install-operator
 	@$(MAKE) go-test-e2e
+	@$(MAKE) go-test-e2e-report
 
-.PHONY: go-test-e2e
-go-test-e2e:
-	rm -rf dist-tests-e2e
-	mkdir dist-tests-e2e
-	go test -v ./e2e-tests/... -tags e2e_tests -timeout 20m 2>&1 | tee ./dist-tests-e2e/go-test-output-e2e.txt
 
 .PHONY: install-kind
 install-kind:
@@ -88,7 +84,13 @@ create-cluster: install-kind
 
 .PHONY: install-operator
 install-operator:
-	kubectl apply -f https://github.com/apache/incubator-kie-tools/blob/c690d462602da4cf2c01b90279815b60a1959162/packages/sonataflow-operator/operator.yaml
+	kubectl create -f ../sonataflow-operator/operator.yaml
+
+.PHONY: go-test-e2e
+go-test-e2e:
+	rm -rf dist-tests-e2e
+	mkdir dist-tests-e2e
+	go test -v ./e2e-tests/... -tags e2e_tests -timeout 20m 2>&1 | tee ./dist-tests-e2e/go-test-output-e2e.txt
 
 .PHONY: go-test-e2e-report
 go-test-e2e-report:

diff --git a/packages/kn-plugin-workflow/package.json b/packages/kn-plugin-workflow/package.json
@@ -42,7 +42,7 @@
     "setup:env": "cross-env QUARKUS_PLATFORM_GROUP_ID=$(build-env knPluginWorkflow.quarkusPlatformGroupId) QUARKUS_VERSION=$(build-env versions.quarkus) PLUGIN_VERSION=$(build-env knPluginWorkflow.version) DEV_MODE_IMAGE_URL=$(build-env knPluginWorkflow.devModeImageUrl) KOGITO_VERSION=$(build-env versions.kogito)",
     "setup:env:win32": "pnpm powershell \"cross-env QUARKUS_PLATFORM_GROUP_ID=$(build-env knPluginWorkflow.quarkusPlatformGroupId) QUARKUS_VERSION=$(build-env versions.quarkus) DEV_MODE_IMAGE_URL=$(build-env knPluginWorkflow.devModeImageUrl) KOGITO_VERSION=$(build-env versions.kogito) PLUGIN_VERSION=$(build-env knPluginWorkflow.version)\"",
     "test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env tests.run)\" --then \"pnpm go:test\" \"pnpm go:test:report\"",
-    "test-e2e": "run-script-if --ignore-errors \"$(build-env endToEndTests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"make go-test-e2e\" \"make go-test-e2e-report\"",
+    "test-e2e": "run-script-if --ignore-errors \"$(build-env endToEndTests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"make test-e2e\"",
     "test-e2e:logs": "run-script-if --ignore-errors \"$(build-env endToEndTests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"pnpm go:test-e2e:logs\" \"pnpm go:test-e2e:report\"",
     "test-e2e:not:quarkus": "run-script-if --ignore-errors \"$(build-env endToEndTests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"pnpm go:test-e2e:not:quarkus\" \"pnpm go:test-e2e:report\"",
     "test-e2e:not:quarkus:logs": "run-script-if --ignore-errors \"$(build-env endToEndTests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"pnpm go:test-e2e:not:quarkus:logs\" \"pnpm go:test-e2e:report\"",