From 79f44cfd80207a97b7d34e84bd381a4715605876 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Wed, 12 Mar 2025 10:52:38 +0000 Subject: [PATCH 1/2] replace references to common repo --- .../ibex_install_utils/tasks/server_tasks.py | 2 +- workflow_support_scripts/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py index c67ead57..0c4375a8 100644 --- a/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py +++ b/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py @@ -338,7 +338,7 @@ def setup_calibrations_repository(self) -> None: ): self.update_calibrations_repository() else: - repo_url = "http://control-svcs.isis.cclrc.ac.uk/gitroot/instconfigs/common.git" + repo_url = "https://gitlab.stfc.ac.uk/isisexperimentcontrols/common.git" location = "C:\Instrument\Settings\config\common" RunProcess( working_dir=os.curdir, diff --git a/workflow_support_scripts/README.md b/workflow_support_scripts/README.md index 738f034a..518dcb46 100644 --- a/workflow_support_scripts/README.md +++ b/workflow_support_scripts/README.md @@ -2,11 +2,11 @@ ### Calibration Files' Location: - `http://control-svcs.isis.cclrc.ac.uk/gitroot/instconfigs/common.git` + `https://gitlab.stfc.ac.uk/isisexperimentcontrols/common.git` This repo should be cloned with: - `git clone http://control-svcs.isis.cclrc.ac.uk/gitroot/instconfigs/common.git C:\Instrument\Settings\config\common` + `git clone https://gitlab.stfc.ac.uk/isisexperimentcontrols/common.git C:\Instrument\Settings\config\common` ### Converting Files From be5b9a23dc0941a4442ea61b7f2756ea789e436b Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Wed, 12 Mar 2025 15:45:21 +0000 Subject: [PATCH 2/2] add comment about username and deploy token --- .../ibex_install_utils/tasks/server_tasks.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py index 0c4375a8..f43b504f 100644 --- a/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py +++ b/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py @@ -352,6 +352,12 @@ def update_calibrations_repository(self) -> None: """Update the calibration repository""" try: repo = git.Repo(CALIBRATION_PATH) + print( + "If this is the first time using the gitlab calibration files repo, " + "you'll be prompted for username and password please enter username " + "(required on git-for-windows!) and deploy token - " + 'see Keeper for this ("Calibrations repository deploy token")' + ) repo.git.pull() except git.GitCommandError: self.prompt.prompt_and_raise_if_not_yes(