Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ELYRA_GITHUB_REPO env var #3278

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add ELYRA_GITHUB_REPO env var #3278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions elyra/airflow/operator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,19 @@
INOUT_SEPARATOR = ";"

ELYRA_GITHUB_ORG = os.getenv("ELYRA_GITHUB_ORG", "elyra-ai")
ELYRA_GITHUB_REPO = os.getenv("ELYRA_GITHUB_REPO", "elyra")
ELYRA_GITHUB_BRANCH = os.getenv("ELYRA_GITHUB_BRANCH", "main" if "dev" in __version__ else "v" + __version__)

ELYRA_BOOTSCRIPT_URL = os.getenv(
"ELYRA_BOOTSTRAP_SCRIPT_URL",
f"https://raw.githubusercontent.com/{ELYRA_GITHUB_ORG}/elyra/{ELYRA_GITHUB_BRANCH}/elyra/airflow/bootstrapper.py",
f"https://raw.githubusercontent.com/{ELYRA_GITHUB_ORG}/"
f"{ELYRA_GITHUB_REPO}/{ELYRA_GITHUB_BRANCH}/elyra/airflow/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",
)


Expand Down
9 changes: 6 additions & 3 deletions elyra/pipeline/kfp/kfp_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,23 +1079,26 @@ def _compose_container_command_args(
account whether the container will run in a CRI-O environment.
"""
elyra_github_org = os.getenv("ELYRA_GITHUB_ORG", "elyra-ai")
elyra_github_repo = os.getenv("ELYRA_GITHUB_REPO", "elyra")
elyra_github_branch = os.getenv("ELYRA_GITHUB_BRANCH", "main" if "dev" in __version__ else "v" + __version__)
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:
container_work_dir = CRIO_VOL_WORKDIR_PATH
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:
Expand Down
Loading