From bcbaca6be3bf003c084c10a0aa7b057a5cdfc05c Mon Sep 17 00:00:00 2001
From: Albin Henriksson <albhe428@student.liu.se>
Date: Tue, 16 Feb 2021 15:48:20 +0100
Subject: [PATCH] #2: Refactored server yml file
---
.gitlab-ci.yml | 1 -
.gitlab/server.gitlab-ci.yml | 23 ++++++++++-------------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01004fdd..bc3e1186 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
stages:
- - server-install
- server-test
- client-install
- client-test
diff --git a/.gitlab/server.gitlab-ci.yml b/.gitlab/server.gitlab-ci.yml
index e4f75df4..33d3934c 100644
--- a/.gitlab/server.gitlab-ci.yml
+++ b/.gitlab/server.gitlab-ci.yml
@@ -1,19 +1,16 @@
-image: python
-cache:
- paths:
- - server/env/
-
-before_script:
- stage: server-install
- - python --version
- - pip install virtualenv
- - cd server/
- - python -m venv env
- - source env/bin/activate
- - pip install -r requirements.txt
test-server:
+ image: python
+ cache:
+ paths:
+ - server/env/
stage: server-test
script:
+ - python --version
+ - pip install virtualenv
+ - cd server/
+ - python -m venv env
+ - source env/bin/activate
+ - pip install -r requirements.txt
- pytest --cov app tests/
--
GitLab