Skip to content
Snippets Groups Projects
Commit 7d99dbc8 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

Update README.md

parent 28a40154
No related branches found
No related tags found
1 merge request!262added 2 fields to workflow
Pipeline #37955 passed
...@@ -39,12 +39,10 @@ These diagrams show the current implementation and are kept up-to-date. ...@@ -39,12 +39,10 @@ These diagrams show the current implementation and are kept up-to-date.
### main GUI: ### main GUI:
* test: https://sdc-dev.astron.nl:5554/atdb/ * test: https://sdc-dev.astron.nl:5554/atdb/
* acc : http://dop457.astron.nl:5554/atdb/
* prod: https://sdc.astron.nl:5554/atdb/ * prod: https://sdc.astron.nl:5554/atdb/
### admin interface: ### admin interface:
* test: https://sdc-dev.astron.nl:5554/atdb/admin/ * test: https://sdc-dev.astron.nl:5554/atdb/admin/
* acc : http://dop457.astron.nl:5554/atdb/admin/
* prod: https://sdc.astron.nl:5554/atdb/admin/ * prod: https://sdc.astron.nl:5554/atdb/admin/
### REST API (prod) ### REST API (prod)
...@@ -65,31 +63,11 @@ Return the sum the sizes of all tasks with a given list of statusses ...@@ -65,31 +63,11 @@ Return the sum the sizes of all tasks with a given list of statusses
![](atdb/docs/ATDB-LDV%20-%20Deployment%20Diagram.png) ![](atdb/docs/ATDB-LDV%20-%20Deployment%20Diagram.png)
### CI/CD (semi) automatic deploy in Docker ### CI/CD (semi) automatic deploy in Docker
A gitlab CI/CD pipeline will automatically build and semi-automatically deploy ATDB on several targets, A gitlab CI/CD pipeline will automatically build after every commit.
depending on the name of the branch. Branches can be deployed to sdc-dev (test)
Master can be deployed to sdc-dev (test) or sdc (production)
* `master` => test: https://sdc-dev.astron.nl:5554/atdb/
* `acceptance`=> acceptance: http://dop457.astron.nl:5554/atdb/
* `release` => prod: https://sdc.astron.nl:5554/atdb/
The deploy step requires pushing the 'play' button in the gitlab pipelines section.
This is done to not have a mandatory deploy for every minor commmit.
## The Procedure:
* commit changes to 'feature branch'
* gitlab: merge with `master`
* pipeline will start running: https://git.astron.nl/astron-sdc/atdb-ldv/-/pipelines
* if 'passed' then click `>>` on the 'deploy' stage, this will deploy to test on sdc-dev
* gitlab: merge with `acceptance`
* pipeline will start running: https://git.astron.nl/astron-sdc/atdb-ldv/-/pipelines
* if 'passed' then click `>>` on the 'deploy' stage, this will deploy to acceptance on dop457
* gitlab: merge with `release`
* pipeline will start running: https://git.astron.nl/astron-sdc/atdb-ldv/-/pipelines
* if 'passed' then click `>>` on the 'deploy' stage, this will deploy to production on sdc
### Manual deploy in Docker (alternative to CI/CD) ### Manual deploy in Docker (alternative to CI/CD)
#### initial #### initial
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment