Skip to content
Snippets Groups Projects
Commit 935249be authored by Chris Hines's avatar Chris Hines
Browse files

further separation of test and dev using angular.json to change configs based... 

further separation of test and dev using angular.json to change configs based on the git branch name
parent 0b417ee2
No related branches found
No related tags found
2 merge requests!21New css dev,!6Dev
Hide whitespace changes
Inline Side-by-side
Showing
with 263 additions and 2 deletions
.gitlab-ci.yml
+ 1
− 1
View file @ 935249be
......@@ -13,7 +13,7 @@ build:
- apt install -y nodejs
- rm ./package-lock.json
- npm install
- ./node_modules/@angular/cli/bin/ng build --prod --base-href=/
- ./node_modules/@angular/cli/bin/ng build --prod --base-href=/ --configuration=$CI_COMMIT_REF_NAME
artifacts:
paths:
- ./dist/
......
angular.json
+ 25
− 1
View file @ 935249be
......@@ -42,6 +42,30 @@
"with": "src/environments/environment.prod.ts"
}
]
},
"test": {
"fileReplacements": [
{
"replace": "src/assets/config/apiservers.json",
"with": "src/assets/config/apiservers.test.json"
},
{
"replace": "src/assets/config/computesites.json",
"with": "src/assets/config/computesites.test.json"
}
]
},
"dev": {
"fileReplacements": [
{
"replace": "src/assets/config/apiservers.json",
"with": "src/assets/config/apiservers.dev.json"
},
{
"replace": "src/assets/config/computesites.json",
"with": "src/assets/config/computesites.dev.json"
}
]
}
}
},
......@@ -129,4 +153,4 @@
"prefix": "app"
}
}
}
\ No newline at end of file
}
src/assets/config/apiservers.dev.json 0 → 100644
+ 14
− 0
View file @ 935249be
[
{
"name": "Dev",
"tes": "https://strudel2-api-dev.cloud.cvl.org.au/tes",
"tws": "https://strudel2-api-dev.cloud.cvl.org.au"
},
{
"name": "Dev - Pawsey",
"tes": "https://strudel2-api-dev-pawsey.cloud.cvl.org.au/tes",
"tws": "https://strudel2-api-dev-pawsey.cloud.cvl.org.au"
}
]
src/assets/config/apiservers.test.json 0 → 100644
+ 9
− 0
View file @ 935249be
[
{
"name": "Testing",
"tes": "https://strudel2-api-test.cloud.cvl.org.au/tes",
"tws": "https://strudel2-api-test.cloud.cvl.org.au"
}
]
src/assets/config/computesites.dev.json 0 → 100644
+ 35
− 0
View file @ 935249be
[
{
"url": "https://strudel2-api-dev.cloud.cvl.org.au/m3/",
"name": "M3",
"host": "m3-login2.massive.org.au",
"dtn": "m3-dtn1.massive.org.au",
"cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
"appCatalog": [],
"appCatalogUri": "./assets/config/m3apps.dev.json",
"cancelcmd": "/usr/local/sv2/dev/sv2scancel.sh {jobid}",
"statcmd": "/usr/local/sv2/dev/sv2stat.py"
},
{
"url": "https://strudel2-api-dev.cloud.cvl.org.au/cvluwa/",
"name": "CVL@UWA",
"host": "146.118.65.246",
"dtn": "146.118.65.246",
"cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
"appCatalog": [],
"appCatalogUri": "./assets/config/cvluwaapps.dev.json",
"cancelcmd": "/usr/local/sv2/dev/sv2scancel.sh {jobid}",
"statcmd": "/usr/local/sv2/dev/sv2stat.py"
},
{
"url": null ,
"name": "Vault-V2@Monash",
"host": "dtn-2.erc.monash.edu.au",
"dtn": "dtn-2.erc.monash.edu.au",
"lscmd": "/srv/home/chines/hsmls.py",
"dtnport": "33001",
"cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
"appCatalog": [],
"appCatalogUri": null
}
]
src/assets/config/computesites.test.json 0 → 100644
+ 35
− 0
View file @ 935249be
[
{
"url": "https://strudel2-api-test.cloud.cvl.org.au/m3/",
"name": "M3",
"host": "m3-login2.massive.org.au",
"dtn": "m3-dtn1.massive.org.au",
"cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
"appCatalog": [],
"appCatalogUri": "./assets/config/m3apps.test.json",
"cancelcmd": "/usr/local/sv2/sv2scancel.sh {jobid}",
"statcmd": "/usr/local/sv2/sv2stat.py"
},
{
"url": "https://strudel2-api-test.cloud.cvl.org.au/cvluwa/",
"name": "CVL@UWA",
"host": "146.118.65.246",
"dtn": "146.118.65.246",
"cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
"appCatalog": [],
"appCatalogUri": "./assets/config/cvluwaapps.test.json",
"cancelcmd": "/usr/local/sv2/sv2scancel.sh {jobid}",
"statcmd": "/usr/local/sv2/sv2stat.py"
},
{
"url": null ,
"name": "Vault-V2@Monash",
"host": "dtn-2.erc.monash.edu.au",
"dtn": "dtn-2.erc.monash.edu.au",
"lscmd": "/srv/home/chines/hsmls.py",
"dtnport": "33001",
"cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
"appCatalog": [],
"appCatalogUri": null
}
]
src/assets/config/cvluwaapps.dev.json 0 → 100644
+ 36
− 0
View file @ 935249be
[
{ "url": null,
"name": "Desktop",
"startscript": "#!/bin/bash\n/usr/local/sv2/desktop/desktop.slurm\n ",
"paramscmd": "/usr/local/sv2/desktop/params.py",
"client": {"cmd": null, "redir": "vnc.html?password={password}" },
"localbind": true,
"applist": null
},
{
"url": null,
"name": "Jupyter Lab",
"startscript": "#!/bin/bash\n/usr/local/sv2/jupyter/jupyter.slurm\n",
"paramscmd": "/usr/local/sv2/jupyter/jupyter_params.py",
"client": {"cmd": null, "redir": "?token={token}"},
"localbind": true,
"applist": null
},
{
"url": null,
"name": "R Studio Server",
"startscript": "#!/bin/bash\n/usr/local/sv2/rstudioserver/run.sh\n",
"paramscmd": "/usr/local/sv2/rstudioserver/params.py",
"client": {"cmd": null, "redir": ""},
"localbind": true,
"applist": null
},
{ "url": "transfer",
"name": "Transfer files",
"startscript": "#!/bin/bash\n echo '{appparams}' > ft.json",
"paramscmd": "/usr/local/sv2/copytool.py",
"client": {"cmd": null, "redir": null },
"localbind": true,
"applist": null
}
]
src/assets/config/cvluwaapps.test.json 0 → 100644
+ 36
− 0
View file @ 935249be
[
{ "url": null,
"name": "Desktop",
"startscript": "#!/bin/bash\n/usr/local/sv2/desktop/desktop.slurm\n ",
"paramscmd": "/usr/local/sv2/desktop/params.py",
"client": {"cmd": null, "redir": "vnc.html?password={password}" },
"localbind": true,
"applist": null
},
{
"url": null,
"name": "Jupyter Lab",
"startscript": "#!/bin/bash\n/usr/local/sv2/jupyter/jupyter.slurm\n",
"paramscmd": "/usr/local/sv2/jupyter/jupyter_params.py",
"client": {"cmd": null, "redir": "?token={token}"},
"localbind": true,
"applist": null
},
{
"url": null,
"name": "R Studio Server",
"startscript": "#!/bin/bash\n/usr/local/sv2/rstudioserver/run.sh\n",
"paramscmd": "/usr/local/sv2/rstudioserver/params.py",
"client": {"cmd": null, "redir": ""},
"localbind": true,
"applist": null
},
{ "url": "transfer",
"name": "Transfer files",
"startscript": "#!/bin/bash\n echo '{appparams}' > ft.json",
"paramscmd": "/usr/local/sv2/copytool.py",
"client": {"cmd": null, "redir": null },
"localbind": true,
"applist": null
}
]
src/assets/config/m3apps.dev.json 0 → 100644
+ 36
− 0
View file @ 935249be
[
{ "url": null,
"name": "Desktop",
"startscript": "#!/bin/bash\n/usr/local/sv2/desktop/desktop.slurm\n ",
"paramscmd": "/usr/local/sv2/desktop/params.py",
"client": {"cmd": null, "redir": "vnc.html?password={password}" },
"localbind": true,
"applist": null
},
{
"url": null,
"name": "Jupyter Lab",
"startscript": "#!/bin/bash\n/usr/local/sv2/jupyter/jupyter.slurm\n",
"paramscmd": "/usr/local/sv2/jupyter/jupyter_params.py",
"client": {"cmd": null, "redir": "?token={token}"},
"localbind": true,
"applist": null
},
{ "url": "transfer",
"name": "Transfer files",
"startscript": "#!/bin/bash\n echo '{appparams}' | /usr/local/sv2/copytool.py\n",
"paramscmd": "/usr/local/sv2/desktop/params.py",
"client": {"cmd": null, "redir": null },
"localbind": true,
"applist": null
},
{
"url": null,
"name": "CryoSPARC",
"startscript": null,
"paramscmd": "/usr/local/sv2/cryosparc/cryosparc_params.py",
"client": {"cmd": null, "redir": ""},
"localbind": true,
"applist": null
}
]
src/assets/config/m3apps.test.json 0 → 100644
+ 36
− 0
View file @ 935249be
[
{ "url": null,
"name": "Desktop",
"startscript": "#!/bin/bash\n/usr/local/sv2/desktop/desktop.slurm\n ",
"paramscmd": "/usr/local/sv2/desktop/params.py",
"client": {"cmd": null, "redir": "vnc.html?password={password}" },
"localbind": true,
"applist": null
},
{
"url": null,
"name": "Jupyter Lab",
"startscript": "#!/bin/bash\n/usr/local/sv2/jupyter/jupyter.slurm\n",
"paramscmd": "/usr/local/sv2/jupyter/jupyter_params.py",
"client": {"cmd": null, "redir": "?token={token}"},
"localbind": true,
"applist": null
},
{ "url": "transfer",
"name": "Transfer files",
"startscript": "#!/bin/bash\n echo '{appparams}' | /usr/local/sv2/copytool.py\n",
"paramscmd": "/usr/local/sv2/desktop/params.py",
"client": {"cmd": null, "redir": null },
"localbind": true,
"applist": null
},
{
"url": null,
"name": "CryoSPARC",
"startscript": null,
"paramscmd": "/usr/local/sv2/cryosparc/cryosparc_params.py",
"client": {"cmd": null, "redir": ""},
"localbind": true,
"applist": null
}
]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment