From ab6f01746cc7c5028ef0a0db1e0ccce72292008c Mon Sep 17 00:00:00 2001 From: Caila Finn Date: Wed, 25 Sep 2024 17:08:24 +0100 Subject: [PATCH 1/2] Replace external data location RE mantidproject/dockerfiles#99 --- buildconfig/CMake/MantidExternalData.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildconfig/CMake/MantidExternalData.cmake b/buildconfig/CMake/MantidExternalData.cmake index 786ad5a54752..738ce5cb0637 100644 --- a/buildconfig/CMake/MantidExternalData.cmake +++ b/buildconfig/CMake/MantidExternalData.cmake @@ -39,7 +39,7 @@ file:///var/bigharddrive/%(algo)/%(hash)" mark_as_advanced(ExternalData_URL_TEMPLATES) list(APPEND ExternalData_URL_TEMPLATES "file:///home/builder/MantidExternalData-readonly/%(algo)/%(hash)") list(APPEND ExternalData_URL_TEMPLATES "file:///Users/builder/MantidExternalData-readonly/%(algo)/%(hash)") -list(APPEND ExternalData_URL_TEMPLATES "http://ndw1598.isis.cclrc.ac.uk/externaldata/%(algo)/%(hash)") +list(APPEND ExternalData_URL_TEMPLATES "http://172.16.114.127/external-data/%(algo)/%(hash)") # This should always be last as it's the main read/write cache list(APPEND ExternalData_URL_TEMPLATES "https://testdata.mantidproject.org/ftp/external-data/%(algo)/%(hash)") From 6c52519a6149d796e7b3c1baccacf079da53f5c3 Mon Sep 17 00:00:00 2001 From: Caila Finn <47181718+cailafinn@users.noreply.github.com> Date: Mon, 28 Oct 2024 16:57:02 +0000 Subject: [PATCH 2/2] Make use of floating IP of Load Balancer We're now linking to a load balancer that links to the node with the external data clone on it. Makes this much less variable when new underlying nodes are used. RE #99 --- buildconfig/CMake/MantidExternalData.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildconfig/CMake/MantidExternalData.cmake b/buildconfig/CMake/MantidExternalData.cmake index 738ce5cb0637..e8833ee0203a 100644 --- a/buildconfig/CMake/MantidExternalData.cmake +++ b/buildconfig/CMake/MantidExternalData.cmake @@ -39,7 +39,7 @@ file:///var/bigharddrive/%(algo)/%(hash)" mark_as_advanced(ExternalData_URL_TEMPLATES) list(APPEND ExternalData_URL_TEMPLATES "file:///home/builder/MantidExternalData-readonly/%(algo)/%(hash)") list(APPEND ExternalData_URL_TEMPLATES "file:///Users/builder/MantidExternalData-readonly/%(algo)/%(hash)") -list(APPEND ExternalData_URL_TEMPLATES "http://172.16.114.127/external-data/%(algo)/%(hash)") +list(APPEND ExternalData_URL_TEMPLATES "http://130.246.80.136/external-data/%(algo)/%(hash)") # This should always be last as it's the main read/write cache list(APPEND ExternalData_URL_TEMPLATES "https://testdata.mantidproject.org/ftp/external-data/%(algo)/%(hash)")