Merge branch 'coffee-testing' of gitlab.ucc.asn.au:frekk/uccportal into coffee-testing

.gitlab-ci.yml

@@ -18,11 +18,13 @@ deploy_test:
   stage: deploy
   tags:
     - test
+  variables:
+    CI_DEBUG_TRACE: "true"
   script:
     - echo "Deploy to test"
     - rm -f /var/www/test/$CI_COMMIT_REF_NAME
-    - ln -s . /var/www/test/$CI_COMMIT_REF_NAME
-    - envsubst < src/gms/settings_local.example.py > src/gms/setting_local.py
+    - ln -srT ./ /var/www/test/$CI_COMMIT_REF_NAME
+    - envsubst < src/gms/settings_local.example.py > src/gms/settings_local.py
     - python src/manage.py makemigrations
     - python src/manage.py migrate --run-syncdb
     - ln -s /etc/uwsgi/vassals/test.skel /etc/uwsgi/vassals/$CI_COMMIT_REF_NAME.ini