From fe2eaa33a02ce7d8ff5510b0be75644bfc461186 Mon Sep 17 00:00:00 2001 From: Maroun Touma Date: Tue, 17 Dec 2024 20:01:34 -0500 Subject: [PATCH] run in kfp folder Signed-off-by: Maroun Touma --- .github/workflows/test-universal-doc_id-kfp.yml | 16 ++++++---------- transforms/.make.cicd.targets | 10 +++++----- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test-universal-doc_id-kfp.yml b/.github/workflows/test-universal-doc_id-kfp.yml index 1e3731eae..ab0cf8c30 100644 --- a/.github/workflows/test-universal-doc_id-kfp.yml +++ b/.github/workflows/test-universal-doc_id-kfp.yml @@ -101,14 +101,10 @@ jobs: timeout-minutes: 120 run: | KFP_BLACK_LIST=$(./scripts/check-workflows.sh -show-kfp-black-list) - if [ -e "transforms/universal/doc_id/Makefile" -a -e "transforms/universal/doc_id/kfp_ray/Makefile" ]; then - transform=$(basename "transforms/universal/doc_id") - if echo ${KFP_BLACK_LIST} | grep -qv ${transform}; then - $PWD/scripts/workflow_helper.sh install-tools - $PWD/scripts/workflow_helper.sh test-workflow transforms/universal/doc_id - else - $PWD/scripts/workflow_helper.sh build-workflow transforms/universal/doc_id - fi + transform=$(basename "transforms/universal/doc_id") + if echo ${KFP_BLACK_LIST} | grep -qv ${transform}; then + $PWD/scripts/workflow_helper.sh install-tools + $PWD/scripts/workflow_helper.sh test-workflow transforms/universal/doc_id else - echo "Skipping transforms/universal/doc_id kfp test for lack of Makefile and/or kfp_ray/Makefile" - fi + $PWD/scripts/workflow_helper.sh build-workflow transforms/universal/doc_id + fi diff --git a/transforms/.make.cicd.targets b/transforms/.make.cicd.targets index 8253b43c0..1668cfb97 100644 --- a/transforms/.make.cicd.targets +++ b/transforms/.make.cicd.targets @@ -176,28 +176,28 @@ setup:: .transforms.setup kind-load-image:: .transforms.kind-load-image -.PHONY: workflow-vent +.PHONY: workflow-venv workflow-venv: if [ -e kfp_ray ]; then \ - $(MAKE) -C kfp_ray TRANSFORM_NAME=$(TRANSFORM_NAME) kfp-workflow-venv; \ + cd kfp_ray && $(MAKE) TRANSFORM_NAME=$(TRANSFORM_NAME) kfp-workflow-venv; \ fi .PHONY: workflow-test workflow-test: if [ -e kfp_ray ]; then \ - $(MAKE) -C kfp_ray TRANSFORM_NAME=$(TRANSFORM_NAME) kfp-workflow-test; \ + cd kfp_ray && $(MAKE) TRANSFORM_NAME=$(TRANSFORM_NAME) kfp-workflow-test; \ fi .PHONY: workflow-upload workflow-upload: if [ -e kfp_ray ]; then \ - $(MAKE) -C kfp_ray TRANSFORM_NAME=$(TRANSFORM_NAME) kfp-workflow-upload; \ + cd kfp_ray && $(MAKE) TRANSFORM_NAME=$(TRANSFORM_NAME) kfp-workflow-upload; \ fi .PHONY: workflow-build workflow-build: if [ -e kfp_ray ]; then \ - $(MAKE) -C kfp_ray TRANSFORM_NAME=$(TRANSFORM_NAME) kfp-workflow-build; \ + cd kfp_ray && $(MAKE) TRANSFORM_NAME=$(TRANSFORM_NAME) kfp-workflow-build; \ fi