more test work

.gitlab-ci.yml

@@ -19,10 +19,11 @@ variables:
 #    selected, manually enter the key value pair using the format in this example: CUSTOM_RUN_DATE 20230115"
 
   CUSTOM_RUN_DATE:
-    value: "20231127"
+    value: "20240702"
     description: "Full-fat tests will pull data from the deployment environment. For robustness, the default option is a
     pre-selected date we know works. To override the default date, manually enter the key value pair using the format 
-    in this example e.g.: CUSTOM_RUN_DATE 20230115"
+    in this example e.g.: CUSTOM_RUN_DATE 20230115 - NOTE THAT IF YOU SELECT A CUSTOM DATE BEFORE THE CURRENT 
+    SEASON_START DATE, THE ADVISORY TEST WILL FAIL AS IT WILL NOT FIND A SURVEY WITHIN THE CURRENT SEASON"
 
 cache:
   paths:
@@ -175,23 +176,6 @@ full_fat_survey:
       - $CI_PROJECT_DIR/test_reports
     expire_in: 10 days
 
-#      python3 full_test_survey.py
-#      --sys_config /storage/app/EWS_prod/regions/EastAfrica/resources/configs/coordinator/fc/sys_config_EastAfrica_fc_live.json
-#      --config /storage/app/EWS_prod/regions/EastAfrica/resources/configs/coordinator/fc/survey_config_EastAfrica_fc_live.json
-#      --outdir ${TEST_WORKSPACE_DIR}/integration/full/
-#      --email_cred /storage/app/EWS_prod/envs/credentials/Cred_gmail.json
-#      --test_report_dir $CI_PROJECT_DIR/test_reports
-#      --custom_run_date $SURVEY_RUN_DATE
-#      --custom_dir_prefix temp_advisory_2024-07-12_111542
-#
-#      python3 full_test_deposition.py
-#      --sys_config /storage/app/EWS_prod/regions/EastAfrica/resources/configs/coordinator/fc/sys_config_EastAfrica_fc_live.json
-#      --config /storage/app/EWS_prod/regions/EastAfrica/resources/configs/coordinator/fc/depo_config_EastAfrica_fc_live.json
-#      --outdir ${TEST_WORKSPACE_DIR}/integration/full/
-#      --email_cred /storage/app/EWS_prod/envs/credentials/Cred_gmail.json
-#      --test_report_dir $CI_PROJECT_DIR/test_reports
-#      --custom_run_date $CUSTOM_RUN_DATE
-#      --custom_dir_prefix temp_advisory_2024-07-12_111542
 
 full_fat_advisory:
   when: manual
@@ -204,6 +188,23 @@ full_fat_advisory:
 
       SURVEY_RUN_DATE=$(date -d "$CUSTOM_RUN_DATE -1 day" +%Y%m%d)
 
+      python3 full_test_survey.py
+      --sys_config /storage/app/EWS_prod/regions/EastAfrica/resources/configs/coordinator/fc/sys_config_EastAfrica_fc_live.json
+      --config /storage/app/EWS_prod/regions/EastAfrica/resources/configs/coordinator/fc/survey_config_EastAfrica_fc_live.json
+      --outdir ${TEST_WORKSPACE_DIR}/integration/full/
+      --email_cred /storage/app/EWS_prod/envs/credentials/Cred_gmail.json
+      --test_report_dir $CI_PROJECT_DIR/test_reports
+      --custom_run_date $SURVEY_RUN_DATE
+      --custom_dir_prefix temp_advisory_$RUN_TIME
+
+      python3 full_test_deposition.py
+      --sys_config /storage/app/EWS_prod/regions/EastAfrica/resources/configs/coordinator/fc/sys_config_EastAfrica_fc_live.json
+      --config /storage/app/EWS_prod/regions/EastAfrica/resources/configs/coordinator/fc/depo_config_EastAfrica_fc_live.json
+      --outdir ${TEST_WORKSPACE_DIR}/integration/full/
+      --email_cred /storage/app/EWS_prod/envs/credentials/Cred_gmail.json
+      --test_report_dir $CI_PROJECT_DIR/test_reports
+      --custom_run_date $CUSTOM_RUN_DATE
+      --custom_dir_prefix temp_advisory_$RUN_TIME
 
       python3 full_test_env_suit.py 
       --sys_config /storage/app/EWS_prod/regions/EastAfrica/resources/configs/coordinator/fc/sys_config_EastAfrica_fc_live.json
@@ -212,7 +213,7 @@ full_fat_advisory:
       --email_cred /storage/app/EWS_prod/envs/credentials/Cred_gmail.json
       --test_report_dir $CI_PROJECT_DIR/test_reports
       --custom_run_date $CUSTOM_RUN_DATE
-      --custom_dir_prefix temp_advisory_2024-07-12_111542
+      --custom_dir_prefix temp_advisory_$RUN_TIME
       
       python3 full_test_advisory.py 
       --sys_config /storage/app/EWS_prod/regions/EastAfrica/resources/configs/coordinator/fc/sys_config_EastAfrica_fc_live.json
@@ -221,7 +222,7 @@ full_fat_advisory:
       --email_cred /storage/app/EWS_prod/envs/credentials/Cred_gmail.json
       --test_report_dir $CI_PROJECT_DIR/test_reports
       --custom_run_date $CUSTOM_RUN_DATE
-      --custom_dir_prefix temp_advisory_2024-07-12_111542
+      --custom_dir_prefix temp_advisory_$RUN_TIME
   artifacts:
     when: always
     paths: