Minor fixes.

Signed-off-by: Revital Sur <eres@il.ibm.com>
IBM · Jun 21, 2024 · b81fa31 · b81fa31
1 parent ba13024
commit b81fa31
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -141,5 +141,13 @@ jobs:
                   export KFPv2=1
                   make -C kind setup
                   make -C kfp/kfp_support_lib test
-                  make setup
-                  make -C transforms/universal/noop workflow-test
+                  make -C transforms setup
+                  dir=("code"  "universal") && index=$(($RANDOM % 2)) && subdirs=${dir[$index]} && transforms=($(find transforms/$subdirs/ -type d  -maxdepth 1 ))
+                  # First element is not really a subdir but rather the current dir so remove it and randomly choose a transform to run
+                  set -- "${transforms[@]}" && shift && transforms=("$@") && size=${#transforms[@]} && index=$(($RANDOM % $size))
+                  export REPOROOT=$PWD
+                  export KIND_SCRIPTS=$PWD/scripts/kind
+                  source scripts/kind/common.sh
+                  header_text "Running ${transforms[$index]} workflow test"
+                  make -C ${transforms[$index]} workflow-test
+                  header_text "Run ${transforms[$index]} completed"
diff --git a/kfp/kfp_ray_components/Makefile b/kfp/kfp_ray_components/Makefile
@@ -12,11 +12,9 @@ DOCKER_IMG=$(DOCKER_LOCAL_IMAGE)
 ifeq ($(KFPv2), 1)
         DOCKER_IMAGE_NAME=kfp-data-processing_v2
         DOCKER_IMAGE_VERSION=${KFP_DOCKER_VERSION_v2}
-        WORKFLOW_SUPPORT_LIB=kfp_v2_workflow_support
 else
         DOCKER_IMAGE_NAME=kfp-data-processing
         DOCKER_IMAGE_VERSION=${KFP_DOCKER_VERSION}
-        WORKFLOW_SUPPORT_LIB=kfp_v1_workflow_support
 endif
 
 .PHONY: .lib-src-image
@@ -48,7 +46,7 @@ set-versions:
 	@$(MAKE) .reconcile-requirements FILE=deleteRayClusterComponent.yaml
 	@$(MAKE) .reconcile-requirements FILE=executeRayJobComponent.yaml
 	@$(MAKE) .reconcile-requirements FILE=executeRayJobComponent_multi_s3.yaml
-	$(REPOROOT)/scripts/transforms/update_dockerfile.sh ${RAY}
+	@$(REPOROOT)/scripts/transforms/update_dockerfile.sh ${RAY}
 ifneq ($(KFPv2), 1)
 	@$(MAKE) .reconcile-requirements FILE=executeSubWorkflowComponent.yaml
 endif

diff --git a/kfp/kfp_support_lib/kfp_v1_workflow_support/Makefile b/kfp/kfp_support_lib/kfp_v1_workflow_support/Makefile
@@ -1,7 +1,6 @@
 # Define the root of the local git clone for the common rules to be able
 # know where they are running from.
 REPOROOT=../../..
-include ${REPOROOT}/.make.versions
 
 # Include the common rules.
 # Use "make help" to see them.

diff --git a/kfp/kfp_support_lib/kfp_v2_workflow_support/Makefile b/kfp/kfp_support_lib/kfp_v2_workflow_support/Makefile
@@ -1,7 +1,6 @@
 # Define the root of the local git clone for the common rules to be able
 # know where they are running from.
 REPOROOT=../../..
-include ${REPOROOT}/.make.versions
 
 # Include the common rules.
 # Use "make help" to see them.

diff --git a/kfp/kfp_support_lib/shared_workflow_support/Makefile b/kfp/kfp_support_lib/shared_workflow_support/Makefile
@@ -1,7 +1,6 @@
 # Define the root of the local git clone for the common rules to be able
 # know where they are running from.
 REPOROOT=../../..
-include ${REPOROOT}/.make.versions
 
 # Include the common rules.
 # Use "make help" to see them.