diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24bf45a6ce8a1a5c2b95dba1000b1b76823db8f5..c62418a9d2202bf62c79178caad4486fa2199d38 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,11 +91,12 @@ 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 ps - # - docker ps -qf "name=emg-pvs_registrar" # - docker exec -it $(docker ps -qf "name=emg-pvs_registrar") python3 /var/www/pvs/dev/pvs_instance/manage.py id list # - 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 + # - docker exec -it $(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 diff --git a/wait_for_container.sh b/wait_for_container.sh index cdf3d79d9105d429b340a4494f5c69224e3b88a4..02cbdbdd60f46410eaa1e8e03e756f93bcad81c2 100755 --- a/wait_for_container.sh +++ b/wait_for_container.sh @@ -7,9 +7,10 @@ for run in 1 2 3; do - docker service ls - docker service logs emg-pvs_preprocessor - docker service logs emg-pvs_renderer - docker service logs emg-pvs_registrar + for service in emg-pvs_preprocessor emg-pvs_renderer emg-pvs_registrar; do + docker service ps --no-trunc $service + docker service inspect $service + done sleep 150 -done \ No newline at end of file +done +