From 9882ec9e367425542f6f29ce683663cc9c7b457d Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Fri, 12 Jul 2024 11:31:15 +0100
Subject: [PATCH] more test work
---
.gitlab-ci.yml | 39 ++++++++++++++++++++++++++++++---------
1 file changed, 30 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1698d2..19fb823 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,7 +125,7 @@ full_fat_depo:
--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_depo_2024-07-12_095208
+ --custom_dir_prefix temp_depo_$RUN_TIME
artifacts:
paths:
- $CI_PROJECT_DIR/test_reports
@@ -145,7 +145,13 @@ full_fat_env_suit:
--config /storage/app/EWS_prod/regions/EastAfrica/resources/configs/coordinator/fc/env_suit_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_env_suit_$RUN_TIME
+ artifacts:
+ paths:
+ - $CI_PROJECT_DIR/test_reports
+ expire_in: 10 days
full_fat_survey:
when: manual
@@ -161,8 +167,13 @@ full_fat_survey:
--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 $CUSTOM_RUN_DATE
- --custom_dir_prefix "temp_survey_$RUN_TIME"
+ --custom_dir_prefix temp_survey_$RUN_TIME
+ artifacts:
+ paths:
+ - $CI_PROJECT_DIR/test_reports
+ expire_in: 10 days
full_fat_advisory:
when: manual
@@ -181,7 +192,7 @@ full_fat_advisory:
--outdir ${TEST_WORKSPACE_DIR}/integration/full/
--email_cred /storage/app/EWS_prod/envs/credentials/Cred_gmail.json
--custom_run_date $SURVEY_RUN_DATE
- --custom_dir_prefix "temp_advisory_2024-07-11_102855"
+ --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
@@ -190,7 +201,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-11_102855"
+ --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
@@ -198,7 +209,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_2024-07-11_102855"
+ --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
@@ -206,7 +217,11 @@ 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_2024-07-11_102855"
+ --custom_dir_prefix temp_advisory_$RUN_TIME
+ artifacts:
+ paths:
+ - $CI_PROJECT_DIR/test_reports
+ expire_in: 10 days
full_fat_epi:
when: manual
@@ -225,25 +240,31 @@ full_fat_epi:
--test_report_dir $CI_PROJECT_DIR/test_reports
--run_date_type $FULL_FAT_RUN_DATE_TYPE
--custom_run_date $CUSTOM_RUN_DATE
- --custom_dir_prefix "temp_advisory_$RUN_TIME"
+ --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
--config /storage/app/EWS_prod/regions/EastAfrica/resources/configs/coordinator/fc/env_suit_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
--run_date_type $FULL_FAT_RUN_DATE_TYPE
--custom_run_date $CUSTOM_RUN_DATE
- --custom_dir_prefix "temp_advisory_$RUN_TIME"
+ --custom_dir_prefix temp_advisory_$RUN_TIME
python3 full_test_epi.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/epi_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
--run_date_type $FULL_FAT_RUN_DATE_TYPE
--custom_run_date $CUSTOM_RUN_DATE
- --custom_dir_prefix "temp_advisory_$RUN_TIME"
+ --custom_dir_prefix temp_advisory_$RUN_TIME
+ artifacts:
+ paths:
+ - $CI_PROJECT_DIR/test_reports
+ expire_in: 10 days
pages:
when: manual
--
GitLab