From a1e62aab482ae8452024d695a8ca9759e12bf155 Mon Sep 17 00:00:00 2001
From: Mussab Abdalla <mussab.abdalla@eox.at>
Date: Thu, 20 Feb 2020 16:25:51 +0100
Subject: [PATCH] restructure steps
---
.gitlab-ci.yml | 55 +++++++++++++++++++++++---------------------------
1 file changed, 25 insertions(+), 30 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5b52f01..1a691d45 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,38 +2,10 @@ variables:
DOCKER_TLS_CERTDIR: ""
stages:
- - test
- build
+ - test
+ - publish
-test:
- image: ubuntu:18.04
- stage: test
- variables:
- BUCKET_NAME: pvs_testing
- services:
- - docker:dind
- before_script:
- - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- script:
- - apt-get update -qy
- - apt-get install -y python-dev python-pip
- - pip install -r requirements.txt
- - pytest
- - docker pull $CI_REGISTRY/pvs_core
- - docker pull $CI_REGISTRY/pvs_cache
- - docker pull $CI_REGISTRY/pvs_preprocessor
- - docker pull $CI_REGISTRY/pvs_client
- - docker stack deploy -c docker-compose.vhr18.yml -c docker-compose.vhr18.dev.yml vhr18-pvs
- - docker exec -it $(docker ps -qf "name=vhr18-pvs_renderer") /bin/bash
- - cd /var/www/pvs/dev/pvs_instance
- - python3 manage.py id list
- # after_script:
- # - docker stack rm vhr18-pvs
- # - docker volume rm vhr18-pvs_db-data
- # - docker volume rm vhr18-pvs_redis-data
- # - docker volume rm vhr18-pvs_traefik-data
- # - docker volume rm vhr18-pvs_cache-db
-
build-master:
image: docker:latest
@@ -100,3 +72,26 @@ build:
- docker push "$IMAGE:$CI_COMMIT_REF_NAME"
except:
- master
+test:
+ image: docker:latest
+ stage: test
+ variables:
+ BUCKET_NAME: pvs_testing
+ services:
+ - docker:dind
+ before_script:
+ - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+ script:
+ - apt-get update -qy
+ - apt-get install -y python-dev python-pip
+ - pip install -r requirements.txt
+ - pytest
+ - docker stack deploy -c docker-compose.vhr18.yml -c docker-compose.vhr18.dev.yml vhr18-pvs
+ - docker exec -it $(docker ps -qf "name=vhr18-pvs_renderer") python3 /var/www/pvs/dev/pvs_instance/manage.py id list
+ # after_script:
+ # - docker stack rm vhr18-pvs
+ # - docker volume rm vhr18-pvs_db-data
+ # - docker volume rm vhr18-pvs_redis-data
+ # - docker volume rm vhr18-pvs_traefik-data
+ # - docker volume rm vhr18-pvs_cache-db
+
\ No newline at end of file
--
GitLab