Skip to content

Commit

Permalink
Merge pull request #704 from revit13/fix13
Browse files Browse the repository at this point in the history
Fix workflow failures due to usage of pip
  • Loading branch information
revit13 authored Oct 14, 2024
2 parents 18c99f5 + 3babebc commit 52369ed
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
8 changes: 7 additions & 1 deletion scripts/workflow_helper.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
#!/bin/bash


# This ensures that the script exits immediately if any command
# returns a non-zero status, preventing cases where the GitHub
# Action running the script might overlook an error if it occurs.
set -euo pipefail

op=$1

install_tools(){
Expand All @@ -25,7 +31,7 @@ test_workflow(){
local workflow="$1"

echo "Testing $workflow"
DEPLOY_KUBEFLOW=1 make -C $workflow setup
DEPLOY_KUBEFLOW=1 make -C scripts/k8s-setup setup
make -C $workflow workflow-test
echo "Run workflow completed"
}
Expand Down
6 changes: 3 additions & 3 deletions transforms/.make.workflows
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ ${WORKFLOW_VENV_ACTIVATE}: ${REPOROOT}/.make.versions ${REPOROOT}/kfp/kfp_ray_co
. ${WORKFLOW_VENV_ACTIVATE}; \
pip install -e $(REPOROOT)/kfp/kfp_support_lib/shared_workflow_support; \
pip install -e $(REPOROOT)/kfp/kfp_support_lib/$(WORKFLOW_SUPPORT_LIB); \
$(MAKE) -C ${REPOROOT}/kfp/kfp_ray_components set-versions
pip install jinja2
pip install pyyaml
$(MAKE) -C ${REPOROOT}/kfp/kfp_ray_components set-versions; \
pip install jinja2; \
pip install pyyaml; \
pip install pre-commit
@# Help: Create the virtual environment common to all workflows

Expand Down
2 changes: 1 addition & 1 deletion transforms/universal/noop/kfp_ray/noop_wf.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def compute_exec_params_func(
def noop(
# Ray cluster
ray_name: str = "noop-kfp-ray", # name of Ray cluster
# Add image_pull_secret and image_pull_policy to ray workers if needed
# Add image_pull_secret, image_pull_policy and tolerations to ray options if needed
ray_head_options: dict = {"cpu": 1, "memory": 4, "image": task_image},
ray_worker_options: dict = {"replicas": 2, "max_replicas": 2, "min_replicas": 2, "cpu": 2, "memory": 4, "image": task_image},
server_url: str = "http://kuberay-apiserver-service.kuberay.svc.cluster.local:8888",
Expand Down

0 comments on commit 52369ed

Please sign in to comment.