From 076d3a60acf522779b3c76aa88a2145005c52605 Mon Sep 17 00:00:00 2001
From: Mussab Abdalla <mussab.abdalla@eox.at>
Date: Wed, 22 Jul 2020 13:45:40 +0200
Subject: [PATCH] one stage build+test

---
 .gitlab-ci.yml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ef2947d..9824c518 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,25 +60,12 @@ build:
     - IMAGE="$CI_REGISTRY_IMAGE/pvs_cache"
     - docker pull "$IMAGE":$CI_COMMIT_REF_NAME || true
     - docker build --cache-from "$IMAGE":$CI_COMMIT_REF_NAME -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME cache/
-
-  except:
-    - master
-test:
-  image: docker:latest
-  stage: build
-  services:
-    - docker:dind
-  before_script:
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
     - chmod +x env_setup.sh wait_for_container.sh
     - ./env_setup.sh
     - mkdir data
-    - docker image ls
     - docker swarm init
     - docker network create -d overlay emg-extnet
     - docker stack deploy -c docker-compose.emg.yml -c docker-compose.emg.dev.yml emg-pvs
-  script:
-
     - apk update && apk add postgresql-dev gcc python3-dev musl-dev py-pip gdal
     - pip3 install -r requirements.txt
     - ./wait_for_container.sh
-- 
GitLab