diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a393dd40d506362b625c42fa4af853eb5ba9bccc..5438736cdbc48ef287b88e0de91b60392ab14b35 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,21 +60,6 @@ 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/ - - docker image ls - - docker tag "$CI_REGISTRY_IMAGE/pvs_core:$CI_COMMIT_REF_NAME" "$CI_REGISTRY_IMAGE/pvs_core:latest" - - docker tag "$CI_REGISTRY_IMAGE/pvs_cache:$CI_COMMIT_REF_NAME" "$CI_REGISTRY_IMAGE/pvs_cache:latest" - - docker tag "$CI_REGISTRY_IMAGE/pvs_preprocessor:$CI_COMMIT_REF_NAME" "$CI_REGISTRY_IMAGE/pvs_preprocessor:latest" - - docker tag "$CI_REGISTRY_IMAGE/pvs_client:$CI_COMMIT_REF_NAME" "$CI_REGISTRY_IMAGE/pvs_client:latest" - - chmod +x env_setup.sh wait_for_container.sh - - ./env_setup.sh - - mkdir data - - 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 - - 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 + - chmod +x gitlab_test.sh + - ./gitlab_test.sh diff --git a/gitlab_test.sh b/gitlab_test.sh new file mode 100644 index 0000000000000000000000000000000000000000..9d5d031badb732dfde29d343ef91d8adecbefdae --- /dev/null +++ b/gitlab_test.sh @@ -0,0 +1,17 @@ +#!/bin/sh +docker tag "$CI_REGISTRY_IMAGE/pvs_core:$CI_COMMIT_REF_NAME" "$CI_REGISTRY_IMAGE/pvs_core:latest" +docker tag "$CI_REGISTRY_IMAGE/pvs_cache:$CI_COMMIT_REF_NAME" "$CI_REGISTRY_IMAGE/pvs_cache:latest" +docker tag "$CI_REGISTRY_IMAGE/pvs_preprocessor:$CI_COMMIT_REF_NAME" "$CI_REGISTRY_IMAGE/pvs_preprocessor:latest" +docker tag "$CI_REGISTRY_IMAGE/pvs_client:$CI_COMMIT_REF_NAME" "$CI_REGISTRY_IMAGE/pvs_client:latest" +chmod +x env_setup.sh wait_for_container.sh +./env_setup.sh +mkdir data +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 +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 \ No newline at end of file