From 17a940a43193a13d9e0511a752e4da3e8f5bd016 Mon Sep 17 00:00:00 2001 From: Zack Wong <coffee@ucc.gu.uwa.edu.au> Date: Sun, 24 Feb 2019 11:13:19 +0800 Subject: [PATCH] Fix ci syntax --- .gitlab-ci.yml | 50 +++++++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 33 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2083eb..8ce607d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,45 +1,29 @@ stages: - - deploy + - test + - deploy before_script: - script: - - echo "preparing environment" - - virtualenv env - - . env/bin/activate - - pip install -r pip-packages.txt - -deploy_staging: - stage: deploy - script: - - echo "Deploy to staging server" - environment: - name: stage - url: https://portal.ucc.asn.au/stage - only: - - master - - deploy_prod: - stage: deploy - script: - - echo "Deploy to production server" - environment: - name: production - url: https://portal.ucc.asn.au - when: manual - only: - - master + - echo "preparing environment" + - virtualenv env + - . env/bin/activate + - pip install -r pip-packages.txt + + +test: + stage: test + script: + - echo "Running tests" deploy_test: - stage: deploy - script: - - echo "Deploy to test" - - . venv/bin/activate + stage: deploy + script: + - echo "Deploy to test" + - . venv/bin/activate - python3 src/manage.py makemigrations - python3 src/manage.py migrate --run-syncdb - ln -s /etc/uwsgi/vassals/test.skel /etc/uwsgi/vassals/$CI_COMMIT_REF_NAME.ini - environment: name: test/$CI_COMMIT_REF_NAME url: https://$CI_COMMIT_REF_NAME.test.ucc.asn.au except: - - master + - master \ No newline at end of file -- GitLab