From 7d99dbc8b17eb2a8d838b98a0a2702e596b0c05a Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Fri, 21 Oct 2022 08:59:21 +0000
Subject: [PATCH] Update README.md
---
README.md | 28 +++-------------------------
1 file changed, 3 insertions(+), 25 deletions(-)
diff --git a/README.md b/README.md
index 383d0162..58cde129 100644
--- a/README.md
+++ b/README.md
@@ -39,12 +39,10 @@ These diagrams show the current implementation and are kept up-to-date.
### main GUI:
* test: https://sdc-dev.astron.nl:5554/atdb/
- * acc : http://dop457.astron.nl:5554/atdb/
* prod: https://sdc.astron.nl:5554/atdb/
### admin interface:
* 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/
### REST API (prod)
@@ -65,31 +63,11 @@ Return the sum the sizes of all tasks with a given list of statusses
### CI/CD (semi) automatic deploy in Docker
-A gitlab CI/CD pipeline will automatically build and semi-automatically deploy ATDB on several targets,
- depending on the name of the branch.
+A gitlab CI/CD pipeline will automatically build after every commit.
+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)
#### initial
--
GitLab