From 902492ce12287a4b5abbaeee78a48d02b32ba68d Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Fri, 12 Jul 2024 13:24:28 +0100
Subject: [PATCH] more test work
---
.gitlab-ci.yml | 9 +++++----
tests/integration/full/full_test_env_suit.py | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf700e1..686cec2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -193,7 +193,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 $SURVEY_RUN_DATE
- --custom_dir_prefix temp_advisory_$RUN_TIME
+ --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
@@ -202,7 +202,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_$RUN_TIME
+ --custom_dir_prefix temp_advisory_2024-07-12_111542
python3 full_test_env_suit.py
--sys_config /storage/app/EWS_prod/regions/EastAfrica/resources/configs/coordinator/fc/sys_config_EastAfrica_fc_live.json
@@ -210,7 +210,7 @@ full_fat_advisory:
--outdir ${TEST_WORKSPACE_DIR}/integration/full/
--email_cred /storage/app/EWS_prod/envs/credentials/Cred_gmail.json
--custom_run_date $CUSTOM_RUN_DATE
- --custom_dir_prefix temp_advisory_$RUN_TIME
+ --custom_dir_prefix temp_advisory_2024-07-12_111542
python3 full_test_advisory.py
--sys_config /storage/app/EWS_prod/regions/EastAfrica/resources/configs/coordinator/fc/sys_config_EastAfrica_fc_live.json
@@ -218,8 +218,9 @@ full_fat_advisory:
--outdir ${TEST_WORKSPACE_DIR}/integration/full/
--email_cred /storage/app/EWS_prod/envs/credentials/Cred_gmail.json
--custom_run_date $CUSTOM_RUN_DATE
- --custom_dir_prefix temp_advisory_$RUN_TIME
+ --custom_dir_prefix temp_advisory_2024-07-12_111542
artifacts:
+ when: always
paths:
- $CI_PROJECT_DIR/test_reports
expire_in: 10 days
diff --git a/tests/integration/full/full_test_env_suit.py b/tests/integration/full/full_test_env_suit.py
index c4c4f17..814d397 100644
--- a/tests/integration/full/full_test_env_suit.py
+++ b/tests/integration/full/full_test_env_suit.py
@@ -42,7 +42,7 @@ class FullTestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite):
sys_config_dict['WorkspacePath'] = IntegrationTestUtils.TEST_OUT_PATH
os.makedirs(IntegrationTestUtils.TEST_OUT_PATH, exist_ok = True)
- job_sys_config_file = IntegrationTestUtils.TEST_OUT_PATH + "temp_sys_advisory_config.json"
+ job_sys_config_file = IntegrationTestUtils.TEST_OUT_PATH + "temp_sys_environment_config.json"
IntegrationTestUtils.write_json_file(sys_config_dict, job_sys_config_file)
# now set the sys config file path to the new job-specific file
@@ -57,7 +57,7 @@ class FullTestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite):
run_dict['EWS-Plotting']['Ethiopia']['FilterForCountry'] = "True"
run_dict['EWS-Plotting']['Kenya']['FilterForCountry'] = "True"
- job_run_config_file = IntegrationTestUtils.TEST_OUT_PATH + "temp_deposition_config.json"
+ job_run_config_file = IntegrationTestUtils.TEST_OUT_PATH + "temp_environment_config.json"
IntegrationTestUtils.write_json_file(run_dict, job_run_config_file)
# set the run config file path to the new job-specific file
--
GitLab