Skip to content

Remove unnessary SSH in release script #1529

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

Merged
jacob720 merged 5 commits into from
Dec 19, 2025
Merged

Remove unnessary SSH in release script #1529

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05e27b8
Remove unnessary SSH in release script
jacob720 Dec 18, 2025
f037aff
Remove use_control_machine
jacob720 Dec 19, 2025
d1b3ef9
Merge branch 'main' into 1505_remove_ssh_in_release_script
jacob720 Dec 19, 2025
2386698
Remove comment
jacob720 Dec 19, 2025
4e7c52f
Merge branch 'main' into 1505_remove_ssh_in_release_script
jacob720 Dec 19, 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
21 changes: 6 additions & 15 deletions utility_scripts/deploy/deploy_mx_bluesky.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,24 +109,18 @@ def _get_permission_groups(beamline: str, dev_mode: bool = False) -> list:
return beamline_groups


def _create_environment_from_control_machine(
def _create_environment(
mx_repo: Deployment,
path_to_create_venv: str,
path_to_dls_dev_env: str,
beamline: str = "i03",
):
try:
user = os.environ["USER"]
except KeyError:
user = input(
"""Couldn't find username from the environment. Enter FedID in order \
to SSH to control machine:"""
)
cmd = f"ssh {user}@{beamline}-control python3 {path_to_create_venv} {path_to_dls_dev_env} {mx_repo.deploy_location}"
cmd = (
f"python3 {path_to_create_venv} {path_to_dls_dev_env} {mx_repo.deploy_location}"
)

process = None
try:
# Call python script on i03-control to create the environment
# Call python script to create the environment
process = subprocess.Popen(cmd, shell=True, text=True, bufsize=1)
process.communicate()
if process.returncode != 0:
Expand Down Expand Up @@ -227,11 +221,8 @@ def main(beamline: str, options: Options):
"utility_scripts/deploy/create_venv.py",
)

# SSH into control machine if not in dev mode
if options.use_control_machine and release_area != DEV_DEPLOY_LOCATION:
Copy link
Contributor

@DominicOram DominicOram Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should: i think we can remove the use_control_machine too

_create_environment_from_control_machine(
mx_repo, path_to_create_venv, path_to_dls_dev_env, beamline
)
_create_environment(mx_repo, path_to_create_venv, path_to_dls_dev_env)
else:
setup_venv(path_to_dls_dev_env, mx_repo.deploy_location)

Expand Down
Loading