diff --git a/README.md b/README.md index 24716340709af59eee83d2ad2c2365b050eb9ae8..43dc2c43513d3492815ef7fa4bfe48319beb05ae 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ This is done to not have a mandatory deploy for every minor commmit. * 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 @@ -113,6 +113,7 @@ This is the procedure for that. > python manage.py migrate --settings=atdb.settings.dev - add new migration file to git - commit & push + - apply 'The Procedure' (see above) to deploy in test, acceptance and production. on CI/CD page: https://git.astron.nl/astron-sdc/atdb-ldv/-/pipelines @@ -121,6 +122,7 @@ This is the procedure for that. on 'test', 'acc' and 'prod' machine's: > docker exec -it atdb-ldv python manage.py makemigrations --settings atdb.settings.docker_sdc + (this should say 'No changes detected', but do this step anyway as a check) > docker exec -it atdb-ldv python manage.py migrate --settings atdb.settings.docker_sdc diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index 4488ef687be2e0880b944c0b11e008f0c37c3977..a5ff93e768c5f8ee6137507247a2dc11f167d8a5 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -27,7 +27,7 @@ class Task(models.Model): resume = models.BooleanField(default=True) creationTime = models.DateTimeField(default=datetime.utcnow, blank=True) - priority = models.IntegerField(default=1, null=True) + priority = models.IntegerField(default=100, null=True) purge_policy = models.CharField(max_length=5, default="no", blank=True, null=True) stage_request_id = models.IntegerField(null=True) diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index cad86fdcc0ef714be513d4b284d96918396f17f3..f0d469bec9fbe0e2c9cc51ebd4a8aae40369bdff 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -45,7 +45,7 @@ </div> {% include 'taskdatabase/pagination.html' %} </div> - <p class="footer"> Version 1.0.0 (25 feb 2021 - 7:00) + <p class="footer"> Version 1.0.0 (25 feb 2021 - 10:00) <script type="text/javascript"> (function(seconds) { var refresh,