From f68da2ba098616e9068b0633027991d6d4d08c7b Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Thu, 11 Jul 2024 11:04:57 +0100
Subject: [PATCH] more work to make full-fat tests wotk with new resources
structure
---
.gitlab-ci.yml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 50 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e4bc055..0f1469c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,7 @@ stages:
- BRANCH="main"
- echo "branch - " $BRANCH
- - RUN_TIME=$(date '+%Y%m%d_%H%M%S')
+ - RUN_TIME=$(date '+%Y-%m-%d_%H%M%S')
- echo "run time - $RUN_TIME"
- PACKAGES_DIR="$CI_PROJECT_DIR/packages/"
- echo "project dir - " $CI_PROJECT_DIR
@@ -173,7 +173,26 @@ full_fat_advisory:
--email_cred /storage/app/EWS_prod/envs/credentials/Cred_gmail.json
--run_date_type $FULL_FAT_RUN_DATE
--custom_run_date $CUSTOM_RUN_DATE
- --custom_dir_prefix "ADVISORY_$RUN_TIME"
+ --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
+ --run_date_type $FULL_FAT_RUN_DATE
+ --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
+ --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
+ --run_date_type $FULL_FAT_RUN_DATE
+ --custom_run_date $CUSTOM_RUN_DATE
+ --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
@@ -192,6 +211,34 @@ full_fat_epi:
- >
cd $CI_PROJECT_DIR/tests/integration/full/
+ 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
+ --run_date_type $FULL_FAT_RUN_DATE
+ --custom_run_date $CUSTOM_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
+ --run_date_type $FULL_FAT_RUN_DATE
+ --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
+ --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
+ --run_date_type $FULL_FAT_RUN_DATE
+ --custom_run_date $CUSTOM_RUN_DATE
+ --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
@@ -199,6 +246,7 @@ full_fat_epi:
--email_cred /storage/app/EWS_prod/envs/credentials/Cred_gmail.json
--run_date_type $FULL_FAT_RUN_DATE
--custom_run_date $CUSTOM_RUN_DATE
+ --custom_dir_prefix "temp_advisory_$RUN_TIME"
pages:
when: manual
--
GitLab