From c11060ee4b09f12b6e3f9857788fcb97740a077e Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Wed, 24 Jan 2024 11:39:03 +0000
Subject: [PATCH] more test work
---
.gitlab-ci.yml | 24 ++++++++++++++----------
configs/docker/build/Dockerfile | 2 +-
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0590ba..8db7a02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -133,11 +133,11 @@ full_fat_depo:
--test_report_dir $CI_PROJECT_DIR/test_reports
--run_date_type $FULL_FAT_RUN_DATE
--custom_run_date $CUSTOM_RUN_DATE
-
- rsync -av --include="*/" --include="log.txt" --exclude="*" $OUTPUT_DIR/ $LOGS_DIR/
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');
@@ -169,6 +169,8 @@ full_fat_env_suit:
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');
@@ -179,8 +181,7 @@ full_fat_env_suit:
artifacts:
when: on_failure
paths:
- - $OUTPUT_DIR/*/log.txt
- - $OUTPUT_DIR/*.txt
+ - $LOGS_DIR
expire_in: 10 days
full_fat_survey:
@@ -202,6 +203,8 @@ full_fat_survey:
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');
@@ -212,8 +215,7 @@ full_fat_survey:
artifacts:
when: on_failure
paths:
- - $OUTPUT_DIR/*/log.txt
- - $OUTPUT_DIR/*.txt
+ - $LOGS_DIR
expire_in: 10 days
full_fat_advisory:
@@ -235,6 +237,8 @@ full_fat_advisory:
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');
@@ -245,8 +249,7 @@ full_fat_advisory:
artifacts:
when: on_failure
paths:
- - $OUTPUT_DIR/*/log.txt
- - $OUTPUT_DIR/*.txt
+ - $LOGS_DIR
expire_in: 10 days
full_fat_epi:
@@ -268,6 +271,8 @@ full_fat_epi:
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');
@@ -278,8 +283,7 @@ full_fat_epi:
artifacts:
when: on_failure
paths:
- - $OUTPUT_DIR/*/log.txt
- - $OUTPUT_DIR/*.txt
+ - $LOGS_DIR
expire_in: 10 days
pages:
diff --git a/configs/docker/build/Dockerfile b/configs/docker/build/Dockerfile
index bd81492..d255fff 100644
--- a/configs/docker/build/Dockerfile
+++ b/configs/docker/build/Dockerfile
@@ -4,7 +4,7 @@ FROM ubuntu:24.04 as base_image
SHELL ["/bin/bash", "-c"]
#install system packages
-RUN apt-get update;apt-get install --assume-yes python-dev-is-python3 python3-dev python3.11-venv wget unzip emacs gdal-bin libgdal-dev build-essential gfortran zlib1g zlib1g-dev libbz2-dev apt-utils liblzma-dev libcurl4-openssl-dev default-jre openssh-server libfribidi-dev libfontconfig1-dev libspatialindex-dev git dos2unix nano;
+RUN apt-get update;apt-get install --assume-yes python-dev-is-python3 python3-dev python3.11-venv wget unzip emacs gdal-bin libgdal-dev build-essential gfortran zlib1g zlib1g-dev libbz2-dev apt-utils liblzma-dev libcurl4-openssl-dev default-jre openssh-server libfribidi-dev libfontconfig1-dev libspatialindex-dev git dos2unix nano rsync;
#sets the timezone to London
RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
--
GitLab