From f501557e577bddf1688a4489d17437fbc3a765b2 Mon Sep 17 00:00:00 2001 From: "Gustavo H. X. Shiroma" Date: Wed, 3 Apr 2024 14:49:29 -0700 Subject: [PATCH 1/3] do not delete the output directory --- src/rtc/rtc_s1.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/rtc/rtc_s1.py b/src/rtc/rtc_s1.py index 3a045b9..1714146 100755 --- a/src/rtc/rtc_s1.py +++ b/src/rtc/rtc_s1.py @@ -620,12 +620,6 @@ def run_parallel(cfg: RunConfig, logfile_path, flag_logger_full_format): f'"{burst_runconfig_list[index_child]}" for burst ID ' f'"{burst_id}"\n') - # if output directory is empty, delete it - if (os.path.isdir(output_dir) and - len(os.listdir(output_dir)) == 0): - logger.info(f'Removing output directory: {output_dir}') - os.rmdir(output_dir) - raise RuntimeError(msg_failed_child_proc) lookside = None From 17955ce3bfef62a078c18411394c00e42e67f264 Mon Sep 17 00:00:00 2001 From: "Gustavo H. X. Shiroma" Date: Wed, 3 Apr 2024 14:51:10 -0700 Subject: [PATCH 2/3] bump version --- Docker/Dockerfile | 4 ++-- build_docker_image.sh | 2 +- src/rtc/version.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 33bc3f5..a6f9d55 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -1,8 +1,8 @@ -FROM oraclelinux:8 + Docker/DockerfileFROM oraclelinux:8 LABEL author="OPERA ADT" \ description="RTC cal/val release R4" \ - version="1.0.2-final" + version="1.0.3-final" RUN yum -y update &&\ yum -y install curl &&\ diff --git a/build_docker_image.sh b/build_docker_image.sh index 4f95746..5f749d6 100755 --- a/build_docker_image.sh +++ b/build_docker_image.sh @@ -2,7 +2,7 @@ REPO=opera IMAGE=rtc -TAG=final_1.0.2 +TAG=final_1.0.3 echo "IMAGE is $REPO/$IMAGE:$TAG" diff --git a/src/rtc/version.py b/src/rtc/version.py index e506e44..0c2831a 100644 --- a/src/rtc/version.py +++ b/src/rtc/version.py @@ -1 +1 @@ -VERSION='1.0.2' +VERSION='1.0.3' From ca280e75a8c85a1f6710199e8327d90dffdb7ab6 Mon Sep 17 00:00:00 2001 From: "Gustavo H. X. Shiroma" Date: Wed, 3 Apr 2024 14:54:54 -0700 Subject: [PATCH 3/3] revert some changes --- Docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker/Dockerfile b/Docker/Dockerfile index a6f9d55..5e5a4ed 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -1,4 +1,4 @@ - Docker/DockerfileFROM oraclelinux:8 +FROM oraclelinux:8 LABEL author="OPERA ADT" \ description="RTC cal/val release R4" \