From ef0508eed135c863ce76e2606b42c424cbda3bec Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Tue, 2 Feb 2021 10:17:13 +1100
Subject: [PATCH] m3 definition for prod and test are the same
---
src/assets/config/computesites.test.json | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/assets/config/computesites.test.json b/src/assets/config/computesites.test.json
index 6faecf9..5715fef 100644
--- a/src/assets/config/computesites.test.json
+++ b/src/assets/config/computesites.test.json
@@ -1,14 +1,28 @@
[
{
- "url": "https://strudel2-api-test.cloud.cvl.org.au/m3/",
+ "url": "https://beta-api.cloud.cvl.org.au/m3/",
"name": "M3",
- "host": "m3-login2.massive.org.au",
+ "host": "m3.massive.org.au",
"dtn": "m3-dtn1.massive.org.au",
"cafingerprint": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
"appCatalog": [],
- "appCatalogUri": "./assets/config/m3apps.test.json",
- "cancelcmd": "/usr/local/sv2/sv2scancel.sh {jobid}",
- "statcmd": "/usr/local/sv2/sv2stat.py",
+ "appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps",
+ "cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}",
+ "statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
"userhealth": "/usr/local/bin/uijson"
+ },
+ {
+ "url": "https://beta-api.cloud.cvl.org.au/cvluwa/",
+ "name": "CVL@UWA",
+ "host": "146.118.65.246",
+ "dtn": "146.118.65.242",
+ "cafingerprint": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
+ "appCatalog": [],
+ "appCatalogCmd": "/home/strudel2/bin/getapps",
+ "cancelcmd": "/home/strudel2/bin/s2cancel {jobid}",
+ "statcmd": "/home/strudel2/bin/s2stat",
+ "userhealth": "/home/strudel2/bin/uijson",
+ "cacheturis": [],
+ "contact": "<CVL@UWA Support> help@massive.org.au"
}
]
--
GitLab