From fb94bd9266be6f1be1e92c3e4e5d472e0f735f1c Mon Sep 17 00:00:00 2001 From: Guilherme Caponetto <638737+caponetto@users.noreply.github.com> Date: Wed, 15 Jan 2025 13:06:20 -0300 Subject: [PATCH] Add ELYRA_GITHUB_REPO env var (#3278) Signed-off-by: Guilherme Caponetto <638737+caponetto@users.noreply.github.com> --- elyra/pipeline/kfp/processor_kfp.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/elyra/pipeline/kfp/processor_kfp.py b/elyra/pipeline/kfp/processor_kfp.py index 9ad681b7f..f83a5e889 100644 --- a/elyra/pipeline/kfp/processor_kfp.py +++ b/elyra/pipeline/kfp/processor_kfp.py @@ -1063,15 +1063,17 @@ def _compose_container_command_args( # and should not be opened as PR against upstream Elyra elyra_github_org = os.getenv("ELYRA_GITHUB_ORG", "opendatahub-io") elyra_github_branch = os.getenv("ELYRA_GITHUB_BRANCH", "main" if "dev" in __version__ else f"v{__version__}") + elyra_github_repo = os.getenv("ELYRA_GITHUB_REPO", "elyra") elyra_bootstrap_script_url = os.getenv( "ELYRA_BOOTSTRAP_SCRIPT_URL", - f"https://raw.githubusercontent.com/{elyra_github_org}/elyra/{elyra_github_branch}/elyra/kfp/bootstrapper.py", # noqa E501 + f"https://raw.githubusercontent.com/{elyra_github_org}/" + f"{elyra_github_repo}/{elyra_github_branch}/elyra/kfp/bootstrapper.py", ) elyra_requirements_url = os.getenv( "ELYRA_REQUIREMENTS_URL", f"https://raw.githubusercontent.com/{elyra_github_org}/" - f"elyra/{elyra_github_branch}/etc/generic/requirements-elyra.txt", + f"{elyra_github_repo}/{elyra_github_branch}/etc/generic/requirements-elyra.txt", ) if is_crio_runtime: @@ -1079,7 +1081,8 @@ def _compose_container_command_args( container_python_path = CRIO_VOL_PYTHON_PATH python_pip_config_url = os.getenv( "ELYRA_PIP_CONFIG_URL", - f"https://raw.githubusercontent.com/{elyra_github_org}/elyra/{elyra_github_branch}/etc/kfp/pip.conf", + f"https://raw.githubusercontent.com/{elyra_github_org}/" + f"{elyra_github_repo}/{elyra_github_branch}/etc/kfp/pip.conf", ) python_user_lib_path_target = f"--target={CRIO_VOL_PYTHON_PATH}" else: