diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4f0abf0e93055a6958c2cf6926300099a9f7a9a..d62c4c3baab0a9fa4e61d662da3b4de0c4a414a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,8 +172,8 @@ full_fat_tests: --config /storage/app/EWS_prod/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json --outdir $OUTPUT_DIR --email_cred /storage/app/EWS_prod/envs/credentials/Cred_gmail.json - #--run_date_type $FULL_FAT_RUN_DATE - #--custom_run_date $CUSTOM_RUN_DATE + --run_date_type $FULL_FAT_RUN_DATE + --custom_run_date $CUSTOM_RUN_DATE if [[ "$FULL_FAT_COPY_OUTPUT" == "true" ]]; then diff --git a/tests/integration/full/full_test_deposition.py b/tests/integration/full/full_test_deposition.py index 96bd36ffa680196070ef119389b039259693768d..d9c9fac710196d22df0103487283f834d57c1c88 100644 --- a/tests/integration/full/full_test_deposition.py +++ b/tests/integration/full/full_test_deposition.py @@ -8,6 +8,7 @@ from integration.partial.integration_test_utils import IntegrationTestUtils class TestFullDeposition(unittest.TestCase): + TEST_OUT_PATH: str = "not_set" TEST_START_DATE: str = '20230126' TEST_JOB_DIR: str = "DEPOSITION_" + TEST_START_DATE @@ -94,18 +95,36 @@ if __name__ == '__main__': parser.add_argument('--config', required = True) parser.add_argument('--outdir', required = True) parser.add_argument('--email_cred', required = True) + parser.add_argument('--run_date_type', required = False) + parser.add_argument('--custom_run_date', required = False) parser.add_argument('unittest_args', nargs='*') _args = parser.parse_args() _config_file: str = _args.config _outdir: str = _args.outdir _email_cred_path: str = _args.email_cred + _run_date_type: str = _args.run_date_type + _custom_run_date: str = _args.custom_run_date IntegrationTestUtils.DEFAULT_CONFIG_FILE_PATH = _config_file TestFullDeposition.TEST_OUT_PATH = _outdir IntegrationTestUtils.EMAIL_CRED_PATH = _email_cred_path + if _run_date_type == "today": + print("today") + elif _run_date_type == "yesterday": + print("yesterday") + elif _run_date_type == "custom": + print(_custom_run_date) + TestFullDeposition.TEST_START_DATE = _custom_run_date + TestFullDeposition.TEST_JOB_DIR = "DEPOSITION_" + _custom_run_date + else: + print("default") + TestFullDeposition.TEST_START_DATE = "20230126" + + TestFullDeposition.TEST_JOB_DIR = "DEPOSITION_" + _custom_run_date + # Now set the sys.argv to the unittest_args (leaving sys.argv[0] alone) - sys.argv[1:] = _args.unittest_args - unittest.main() + # sys.argv[1:] = _args.unittest_args + # unittest.main()