From 412292f5a56298f85adaeeef0aa0fdf978b027db Mon Sep 17 00:00:00 2001
From: Rob Swaters <rswaters@stsci.edu>
Date: Tue, 21 May 2024 14:44:06 +0000
Subject: [PATCH 1/6] Add p.wait() to ensure exit code is propagated

---
 caldp/process.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/caldp/process.py b/caldp/process.py
index 36e40b0..b18bcd8 100644
--- a/caldp/process.py
+++ b/caldp/process.py
@@ -374,6 +374,8 @@ def run(self, exit_code, cmd, *args):
             p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
             for line in p.stdout:
                 log.echo(line.strip().decode("utf-8"))
+            # Wait for process to complete otherwise p.returncode is None and errors don't propagate
+            p.wait()
             if p.returncode in self.ignore_err_nums:
                 log.info("Ignoring error status =", p.returncode)
             elif p.returncode:

From 09a6b38899523194cef9b4f28f7439c7812f791f Mon Sep 17 00:00:00 2001
From: Rob Swaters <rswaters@stsci.edu>
Date: Fri, 20 Sep 2024 17:49:47 +0000
Subject: [PATCH 2/6] Update changelog.md

---
 changelog.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/changelog.md b/changelog.md
index 3edea27..cba383e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1 @@
-- default base docker image set to CALDP_mostlyCOS_CAL_rc5
-- default crds update to hst_1169.pmap
-- update to spec-plots 1.36.0
-- fix Dockerfile after switch to stream9 base image
+- Added p.wait() in process.py to propagate errors correctly

From 5c7ff9dd8d57eed715acb3b51af529ab6af87c75 Mon Sep 17 00:00:00 2001
From: Rob Swaters <rswaters@stsci.edu>
Date: Wed, 25 Sep 2024 14:58:06 +0000
Subject: [PATCH 3/6] add ignored exceptions for SVM/MVM

---
 caldp/process.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/caldp/process.py b/caldp/process.py
index b18bcd8..9a3c045 100644
--- a/caldp/process.py
+++ b/caldp/process.py
@@ -937,6 +937,11 @@ class SvmManager(Manager):
         Runs SVM workflow on dataset_input.out file.
     """
 
+    # In some cases, the inputs to SVM are not suitable for SVM generation.
+    # 55.  Only non-viable or SBC/HRC images in the multi-visit table - no processing done.
+    # 65.  No viable images in single/multi-visit table - no processing done.
+    ignore_err_nums = [55, 65]
+
     def __init__(self, dataset, input_uri, output_uri):
         super().__init__(dataset, input_uri, output_uri)
         self.ipppss = get_svm_obs_set(self.dataset)
@@ -1066,6 +1071,11 @@ class MvmManager(Manager):
         Runs MVM workflow on dataset_input.out file.
     """
 
+    # In some cases, the inputs to SVM are not suitable for SVM generation.
+    # 55.  Only non-viable or SBC/HRC images in the multi-visit table - no processing done.
+    # 65.  No viable images in single/multi-visit table - no processing done.
+    ignore_err_nums = [55, 65]
+
     def __init__(self, dataset, input_uri, output_uri):
         super().__init__(dataset, input_uri, output_uri)
         self.runmultihap = "runmultihap"

From 4143e49600bb6429da4d83a61fd7a550b4d8aa70 Mon Sep 17 00:00:00 2001
From: Rob Swaters <rswaters@stsci.edu>
Date: Wed, 25 Sep 2024 18:01:56 +0000
Subject: [PATCH 4/6] Update changelog.md

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index cba383e..e43f619 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1 +1,2 @@
 - Added p.wait() in process.py to propagate errors correctly
+- set 55 and 65 as ignored error numbers in SVM and MVM Manager classes

From 7a83d555bafea6ac5c425545d0612d22463faa9d Mon Sep 17 00:00:00 2001
From: Rob Swaters <rswaters@stsci.edu>
Date: Mon, 14 Oct 2024 18:34:07 +0000
Subject: [PATCH 5/6] Add --allow-erasing to yum

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 303e56b..3097f30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,7 +45,7 @@ RUN ./fix-certs
 RUN  yum remove -y kernel-devel && \
  yum install -y epel-release && \
  yum update  -y && \
- yum install -y \
+ yum install -y --allowerasing \
    emacs-nox \
    make \
    gcc \

From 933209abe7884923e27e6c90e17fd7e9f82e4b98 Mon Sep 17 00:00:00 2001
From: Rob Swaters <rswaters@stsci.edu>
Date: Tue, 29 Oct 2024 18:33:43 +0000
Subject: [PATCH 6/6] Update caldp-setup

---
 caldp-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/caldp-setup b/caldp-setup
index 5836de8..5dcb7ac 100755
--- a/caldp-setup
+++ b/caldp-setup
@@ -9,7 +9,7 @@ export PATH=`pwd`/scripts:${PATH}
 export CRDS_CONTEXT=hst_1169.pmap
 
 # Version of stsci/hst-pipeline base image to use
-export BASE_IMAGE_TAG=CALDP_20240813_CAL_final
+export BASE_IMAGE_TAG=2024.10.1.1-mostlycos-py311
 
 # Docker repo
 #