From 898513fa17693a99ceecfadb95bcab3e8592820a Mon Sep 17 00:00:00 2001
From: Mussab Abdalla <mussab.abdalla@eox.at>
Date: Tue, 10 Mar 2020 16:59:10 +0100
Subject: [PATCH] move the stack deploy to before_install
---
.gitlab-ci.yml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c4c3f73..b0550370 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,17 +77,19 @@ test:
stage: test
variables:
BUCKET_NAME: pvs_testing
+ UPLOAD_CONTAINER: preprocessor_test
services:
- docker:dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+ - 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
- pip3 install -r requirements.txt
- chmod +x env_setup.sh wait_for_container.sh
- ./env_setup.sh
- docker swarm init
- - docker stack deploy -c docker-compose.emg.yml -c docker-compose.emg.dev.yml emg-pvs
# - ./wait_for_container.sh
- docker ps
# - docker ps -qf "name=emg-pvs_registrar"
@@ -95,7 +97,8 @@ test:
# - docker exec -it $(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
- # after_script:
+ 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
--
GitLab