diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ea316d0f7d84700a76b1c505b65d1d02959af26..815ed1ad895956ad1f5d19e0b9a7c4581353b262 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,11 +97,8 @@ test: - apk update && apk add postgresql-dev gcc python3-dev musl-dev py-pip gdal - pip3 install -r requirements.txt - ./wait_for_container.sh - - echo $emg_obs - - cat $emg_obs - - cat ./env/emg_obs.env - # - 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_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 diff --git a/env_setup.sh b/env_setup.sh index 21c7aa9fcf8d3e59bb2ff61dc780a9a054940f9c..a16e4767bcf8bffd55b7f5641f0bb362f706a627 100644 --- a/env_setup.sh +++ b/env_setup.sh @@ -7,5 +7,5 @@ cat $emg_db > ./env/emg_db.env cat $emg_django > ./env/emg_django.env cat $emg_obs > ./env/emg_obs.env -sed -i -e 's/emg-data/pvs-testing/g' ./env/emg.env -sed -i -e 's/vhr18-data/pvs-testing/g' ./env/emg.env +sed -i -e 's/emg-data/pvs_testing/g' ./env/emg.env +sed -i -e 's/vhr18-data/pvs_testing/g' ./env/emg.env