From 580e2c0b10ee839832bf1d954f1a9247d391cc43 Mon Sep 17 00:00:00 2001
From: Mussab Abdalla <mussab.abdalla@eox.at>
Date: Mon, 3 Aug 2020 15:42:21 +0200
Subject: [PATCH] update gitlab-ci
---
.gitlab-ci.yml | 38 --------------------------------------
1 file changed, 38 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2aed8fac..385c8310 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,42 +70,4 @@ build:
- ./gitlab_test.sh
except:
- master
-<<<<<<< HEAD
-test:
- image: docker:latest
-
- services:
- - docker:dind
- before_script:
- - apk update && apk add bash postgresql-dev gcc python3-dev musl-dev py-pip gdal
- - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- - chmod +x env_setup.sh wait_for_container.sh registrar_test.sh
- - ./env_setup.sh
- - mkdir data
- - IMAGE="$CI_REGISTRY_IMAGE/pvs_core"
- - docker pull "$IMAGE"
- - docker tag "$IMAGE" "$IMAGE:latest"
- - IMAGE="$CI_REGISTRY_IMAGE/pvs_cache"
- - docker pull "$IMAGE"
- - docker tag "$IMAGE" "$IMAGE:latest"
- - IMAGE="$CI_REGISTRY_IMAGE/pvs_preprocessor"
- - docker pull "$IMAGE"
- - docker tag "$IMAGE" "$IMAGE:latest"
- - IMAGE="$CI_REGISTRY_IMAGE/pvs_client"
- - docker pull "$IMAGE"
- - docker tag "$IMAGE" "$IMAGE:latest"
- - 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:
-
- - ./wait_for_container.sh
- - pip3 install -r requirements.txt
- - bash ./registrar_test.sh product_list.csv
-
- after_script:
-
-
-=======
->>>>>>> master
--
GitLab