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

[rqd] Feature: RQD use host env vars #1324

Merged
merged 14 commits into from
Feb 27, 2025
Merged

[rqd] Feature: RQD use host env vars #1324

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5684119
Feature: RQD use host env vars
Tilix4 Oct 20, 2023
567908e
Merge branch 'master' into feature-rqd_use_host_env_vars
DiegoTavares Feb 27, 2025
a014e75
Update rqd/rqd/rqconstants.py
DiegoTavares Feb 27, 2025
7ace8eb
Fix issue caused by merging conflicts
DiegoTavares Feb 27, 2025
fc18bcc
Update rqd/rqd/rqcore.py
DiegoTavares Feb 27, 2025
2e39edb
Update rqd/rqd/rqconstants.py
DiegoTavares Feb 27, 2025
6c16494
Update rqd/rqd/rqcore.py
DiegoTavares Feb 27, 2025
04465d6
Update rqd/rqd/rqconstants.py
DiegoTavares Feb 27, 2025
683625c
Update rqcore.py
DiegoTavares Feb 27, 2025
0fde727
Update rqd/rqd/rqconstants.py
DiegoTavares Feb 27, 2025
390069e
Rename variable for clarity
DiegoTavares Feb 27, 2025
126d87d
Fix lint
DiegoTavares Feb 27, 2025
c2b8f1a
Fix lint
DiegoTavares Feb 27, 2025
f5aa0bc
Update rqd/rqd/rqcore.py
DiegoTavares Feb 27, 2025
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
5 changes: 5 additions & 0 deletions rqd/rqd/rqconstants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@
# Use the PATH environment variable from the RQD host.
RQD_USE_PATH_ENV_VAR = False

# Use the environment variables from the RQD host.
RQD_USE_HOST_ENV_VARS = False

RQD_BECOME_JOB_USER = True
RQD_CREATE_USER_IF_NOT_EXISTS = True
RQD_TAGS = ''
Expand Down Expand Up @@ -184,6 +187,8 @@
RQD_USE_IPV6_AS_HOSTNAME = config.getboolean(__section, "RQD_USE_IPV6_AS_HOSTNAME")
if config.has_option(__section, "RQD_USE_PATH_ENV_VAR"):
RQD_USE_PATH_ENV_VAR = config.getboolean(__section, "RQD_USE_PATH_ENV_VAR")
if config.has_option(__section, "RQD_USE_HOST_ENV_VARS"):
RQD_USE_HOST_ENV_VARS = config.getboolean(__section, "RQD_USE_HOST_ENV_VARS")
if config.has_option(__section, "RQD_BECOME_JOB_USER"):
RQD_BECOME_JOB_USER = config.getboolean(__section, "RQD_BECOME_JOB_USER")
if config.has_option(__section, "RQD_TAGS"):
Expand Down
11 changes: 10 additions & 1 deletion rqd/rqd/rqcore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,22 @@ def __createEnvVariables(self):
if 'GPU_LIST' in self.runFrame.attributes:
self.frameEnv['CUE_GPU_CORES'] = self.runFrame.attributes['GPU_LIST']

# Add host environment variables
if rqd.rqconstants.RQD_USE_HOST_ENV_VARS:
for key, value in os.environ.items():
if "PATH" in key and key in self.frameEnv:
self.frameEnv[key] += os.pathsep + value

self.frameEnv[key] = value


def _createCommandFile(self, command):
"""Creates a file that subprocess. Popen then executes.
@type command: string
@param command: The command specified in the runFrame request
@rtype: string
@return: Command file location"""
# TODO: this should use tempfile to create the files and clean them up afterwards
# TODO: this should use tempfile to create the files and clean them up afterwards
try:
if platform.system() == "Windows":
rqd_tmp_dir = os.path.join(tempfile.gettempdir(), 'rqd')
Expand Down