diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e6aecf6edae3951caf2d89ba86a40bd42e29559..a2130a7f35d7e7fcdc6687efe9b933db411e4d25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,7 +99,6 @@ test: - ./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" - - docker service ls - 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 diff --git a/registrar_test.py b/registrar_test.py index e7edc777dd996a859f167a136acaf628f3fd5567..ac83be6904418a399a8bdde8632eb45a3139a915 100644 --- a/registrar_test.py +++ b/registrar_test.py @@ -1,11 +1,11 @@ import psycopg2 import os -database_user = os.environ.get('DB_USER_DOWNLOAD') -database_password = os.environ.get('DB_PW_DOWNLOAD') -host = os.environ.get('DB_HOST_DOWNLOAD') -port = os.environ.get('DB_PORT_DOWNLOAD') -database = os.environ.get('DB_NAME_DOWNLOAD') +database_user = os.environ.get('DB_USER') +database_password = os.environ.get('DB_PW') +host = os.environ.get('DB_HOST') +port = os.environ.get('DB_PORT') +database = os.environ.get('DB_NAME') def connect_to_db(eo_id): global db_name, coverage_id