From ac0861fb4d533641d37002fbc3bd13d386c2673f Mon Sep 17 00:00:00 2001
From: Mussab Abdalla <mussab.abdalla@eox.at>
Date: Thu, 26 Mar 2020 11:59:46 +0100
Subject: [PATCH] cleanup .yaml file
---
.gitlab-ci.yml | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2151d29b..033572a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,10 +74,7 @@ build:
- master
test:
image: docker:latest
- # variables:
- # DOCKER_HOST: tcp://docker:2375
- # DOCKER_TLS_CERTDIR: ""
- # stage: test
+
services:
- docker:dind
before_script:
@@ -97,21 +94,19 @@ test:
- docker network create -d overlay emg-extnet
- docker stack deploy -c docker-compose.emg.yml -c docker-compose.emg.dev.yml emg-pvs
script:
- # - swift post --auth-version $ST_AUTH_VERSION_DOWNLOAD --os-identity-api-version 3 --os-auth-url $OS_AUTH_URL_DOWNLOAD --os-username $OS_USERNAME_DOWNLOAD --os-password $OS_PASSWORD_DOWNLOAD --os-tenant-name $OS_TENANT_NAME_DOWNLOAD --os-tenant-id $OS_TENANT_ID_DOWNLOAD --os-region-name $OS_REGION_NAME_DOWNLOAD preprocessor_test
+
- apk update && apk add postgresql-dev gcc python3-dev musl-dev py-pip gdal
- pip3 install -r requirements.txt
- ./wait_for_container.sh
- docker exec -i $(docker ps -qf "name=emg-pvs_registrar") python3 /var/www/pvs/dev/pvs_instance/manage.py storage create pvs_testing pvs_testing --type swift --storage-auth auth-cloud-ovh
- docker exec -i $(docker ps -qf "name=emg-pvs_registrar") python3 /core/registrar.py --objects-prefix "OA/PH1B/0.1/b9/urn:eop:PHR:MULTISPECTRAL_0.5m:DS_PHR1B_201608070959189_FR1_PX_E012N32_0719_00974_4148/0000/PH1B_PHR_FUS_1A_20160807T095918_20160807T095920_TOU_1234_4148.DIMA.tar"
- pytest -s registrar_test.py --name OA/PH1B/0.1/b9/urn:eop:PHR:MULTISPECTRAL_0.5m:DS_PHR1B_201608070959189_FR1_PX_E012N32_0719_00974_4148/0000/PH1B_PHR_FUS_1A_20160807T095918_20160807T095920_TOU_1234_4148.DIMA.tar
- # - docker exec -i $(docker ps -qf "name=emg-pvs_preprocessor") /bin/sh python3 /preprocessor.py Emergency --tar-object-path "/pvs_testing/OA/PH1B/0.2/e8/urn:eop:PHR:MULTISPECTRAL_0.5m:DS_PHR1B_201707271114024_FR1_PX_W006N35_0918_03164_b7e7/0000/PH1B_PHR_FUS__3_20170727T111402_20170727T111407_TOU_1234_b7e7.DIMA.tar" --upload-container preprocessor_test
after_script:
- # - swift delete --auth-version $ST_AUTH_VERSION_DOWNLOAD --os-identity-api-version 3 --os-auth-url $OS_AUTH_URL_DOWNLOAD --os-username $OS_USERNAME_DOWNLOAD --os-password $OS_PASSWORD_DOWNLOAD --os-tenant-name $OS_TENANT_NAME_DOWNLOAD --os-tenant-id $OS_TENANT_ID_DOWNLOAD --os-region-name $OS_REGION_NAME_DOWNLOAD preprocessor_test
- # - docker volume rm emg-pvs_db-data
- # - docker volume rm emg-pvs_redis-data
- # - docker volume rm emg-pvs_instance-data
- # - docker volume rm emg-pvs_cache-db
+ - docker volume rm emg-pvs_db-data
+ - docker volume rm emg-pvs_redis-data
+ - docker volume rm emg-pvs_instance-data
+ - docker volume rm emg-pvs_cache-db
\ No newline at end of file
--
GitLab