diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9da36d12132e52cd03ba77aa5928eb7593c9115a..cd24e09fc41e353b0336334248f7cc777d310c05 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,14 +20,6 @@ variables: CUSTOM_RUN_DATE: "NOT_SET" - FULL_FAT_COPY_OUTPUT: - value: "false" - options: - - "true" - - "false" - description: "Select \"true\" to make a copy of the full-fat integration test output. Outputs will be copied to the - production machine at /storage/app/EWS_prod/regions/EastAfrica/test_workspace" - cache: paths: - .cache/pip @@ -50,7 +42,6 @@ stages: - echo "pip dir - " $PIP_CACHE_DIR - echo "full-fat run date - " $FULL_FAT_RUN_DATE - echo "custom full-fat run date - " $CUSTOM_RUN_DATE - - echo "full-fat copy output - " $FULL_FAT_COPY_OUTPUT - source /storage/app/EWS_prod/envs/venv/ews_prod/bin/activate - pip install coverage @@ -125,26 +116,14 @@ full_fat_depo: script: - > cd $CI_PROJECT_DIR/tests/integration/full/ - date=$(date '+%Y-%m-%d-%H%M'); python3 full_test_deposition.py --config /storage/app/EWS_prod/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json - --outdir ${TEST_WORKSPACE_DIR}/integration/full/${date} + --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 - after_script: - - > - rsync -av --include="*/" --include="log.txt" --exclude="*" $OUTPUT_DIR/ $LOGS_DIR/ - - if [[ "$FULL_FAT_COPY_OUTPUT" == "true" ]]; - then - date=$(date '+%Y-%m-%d-%H%M'); - mkdir ${TEST_WORKSPACE_DIR}/integration/full/${date}; - cp -r $OUTPUT_DIR/* ${TEST_WORKSPACE_DIR}/integration/full/${date}; - fi - artifacts: paths: - $LOGS_DIR @@ -162,22 +141,11 @@ full_fat_env_suit: python3 full_test_env_suit.py --config /storage/app/EWS_prod/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json - --outdir $OUTPUT_DIR + --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 - after_script: - - > - rsync -av --include="*/" --include="log.txt" --exclude="*" $OUTPUT_DIR/ $LOGS_DIR/ - - if [[ "$FULL_FAT_COPY_OUTPUT" == "true" ]]; - then - date=$(date '+%Y-%m-%d-%H%M'); - mkdir ${TEST_WORKSPACE_DIR}/integration/full/${date}; - cp -r $OUTPUT_DIR/* ${TEST_WORKSPACE_DIR}/integration/full/${date}; - fi - artifacts: paths: - $LOGS_DIR @@ -192,25 +160,13 @@ full_fat_survey: script: - > cd $CI_PROJECT_DIR/tests/integration/full/; - date=$(date '+%Y-%m-%d-%H%M'); python3 full_test_survey.py --config /storage/app/EWS_prod/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json - --outdir ${TEST_WORKSPACE_DIR}/integration/full/${date}/ + --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 - after_script: - - > - rsync -av --include="*/" --include="log.txt" --exclude="*" $OUTPUT_DIR/ $LOGS_DIR/ - - if [[ "$FULL_FAT_COPY_OUTPUT" == "true" ]]; - then - date=$(date '+%Y-%m-%d-%H%M'); - mkdir ${TEST_WORKSPACE_DIR}/integration/full/${date}; - cp -r $OUTPUT_DIR/* ${TEST_WORKSPACE_DIR}/integration/full/${date}; - fi - artifacts: paths: - $LOGS_DIR @@ -228,22 +184,11 @@ full_fat_advisory: python3 full_test_advisory.py --config /storage/app/EWS_prod/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json - --outdir $OUTPUT_DIR + --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 - after_script: - - > - rsync -av --include="*/" --include="log.txt" --exclude="*" $OUTPUT_DIR/ $LOGS_DIR/ - - if [[ "$FULL_FAT_COPY_OUTPUT" == "true" ]]; - then - date=$(date '+%Y-%m-%d-%H%M'); - mkdir ${TEST_WORKSPACE_DIR}/integration/full/${date}; - cp -r $OUTPUT_DIR/* ${TEST_WORKSPACE_DIR}/integration/full/${date}; - fi - artifacts: paths: - $LOGS_DIR @@ -261,22 +206,11 @@ full_fat_epi: python3 full_test_epi.py --config /storage/app/EWS_prod/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json - --outdir $OUTPUT_DIR + --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 - after_script: - - > - rsync -av --include="*/" --include="log.txt" --exclude="*" $OUTPUT_DIR/ $LOGS_DIR/ - - if [[ "$FULL_FAT_COPY_OUTPUT" == "true" ]]; - then - date=$(date '+%Y-%m-%d-%H%M'); - mkdir ${TEST_WORKSPACE_DIR}/integration/full/${date}; - cp -r $OUTPUT_DIR/* ${TEST_WORKSPACE_DIR}/integration/full/${date}; - fi - artifacts: paths: - $LOGS_DIR