Merge pull request #305 from uoregon-libraries/release/v4.3.2

Release v4.3.2
uoregon-libraries · Apr 4, 2024 · 8f0d093 · 8f0d093
2 parents ef373d8 + 471f2a0
commit 8f0d093
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 55 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,40 @@ Brief description, if necessary
 ### Migration
 -->
 
+## v4.3.2
+
+Minor improvements.
+
+### Fixed
+
+- Uploaded issues can no longer be doubly queued for ingest into NCA. This was
+  extremely rare with the "prevent double submit" JS, but it did manage to
+  happen a couple times for us.
+- Test recipes no longer run workers needlessly after batch approval. Instead
+  they instruct you to mark the batches live so the full process can be
+  completed and tested (marking the batch live and setting it ready for
+  archive).
+
+### Changed
+
+- Upgraded the docker SFTPGo version to 2.5
+- Changed how NCA connects to SFTPGo on user updates to match the way SFTPGo
+  2.5 works. This should be compatible with older SFTPGo versions.
+
+### Migration
+
+- If you're running an older version of SFTPGo you may have to upgrade to
+  v2.5.0. I expect the NCA changes to be backward-compatible, but I'm not 100%
+  certain.
+- If you have a long-running dev setup for some reason, your SFTPGo database
+  won't work with this update. You should generally just be okay to start
+  fresh, as the docker setup isn't meant for long-term data storage, but if you
+  absolutely need to keep your SFTPGo data intact, you'll have to either
+  override the SFTPGo version (in `docker-compose.override.yml`) or figure out
+  how to do the data upgrade manually. SFTPGo only works when migrating data
+  one minor version at a time. e.g., assuming you were on v2.3, you'll need to
+  get SFTPGo v2.4, migrate, then go to 2.5 and migrate again.
+
 ## v4.3.1
 
 Batch purging. That's all.

diff --git a/changelogs/2024-03-06-sftpgo.md b/changelogs/2024-03-06-sftpgo.md
diff --git a/changelogs/2024-04-01-double-queue.md b/changelogs/2024-04-01-double-queue.md
diff --git a/test/recipes/general-test.sh b/test/recipes/general-test.sh
@@ -62,23 +62,7 @@ else
   ./manage restore 02-$name
 fi
 
-wait_db
-
-# Generate batches
-./bin/queue-batches -c ./settings
-
-# Start workers, wait for jobs to complete (~30sec)
-workonce 2>&1 | tee -a workers.log
-
-echo "Approve batches manually in NCA, then press [ENTER] continue"
-read
-workonce 2>&1 | tee -a workers.log
-
-# Batches' statuses in NCA should read "passed_qc", no jobs should be anything
-# other than "success"
-
-echo "Verify all batches' statuses are 'passed_qc', then press [ENTER] to continue"
-read
+finish_batches
 
 cd test
 ./report.sh $name

diff --git a/test/recipes/invalid-title-test.sh b/test/recipes/invalid-title-test.sh
@@ -75,21 +75,7 @@ mysql -unca -pnca -Dnca -h127.0.0.1 -e "
     LIMIT 1
 "
 
-# Generate batches
-./bin/queue-batches -c ./settings
-
-# Start workers, wait for jobs to complete (~30sec)
-workonce 2>&1 | tee -a workers.log
-
-echo "Approve batches manually in NCA, then press [ENTER] continue"
-read
-workonce 2>&1 | tee -a workers.log
-
-# Batches' statuses in NCA should read "passed_qc", no jobs should be anything
-# other than "success"
-
-echo "Verify all batches' statuses are 'passed_qc', then press [ENTER] to continue"
-read
+finish_batches
 
 cd test
 ./report.sh $name

diff --git a/test/recipes/testlib.sh b/test/recipes/testlib.sh
@@ -33,4 +33,22 @@ prep_and_backup_00() {
       ./manage restore 00-$name
     fi
   fi
-}
+}
+
+finish_batches() {
+  wait_db
+
+  # Generate batches
+  ./bin/queue-batches -c ./settings
+
+  # Start workers, wait for jobs to complete (~30sec)
+  workonce 2>&1 | tee -a workers.log
+
+  echo "Approve batches manually in NCA, mark them live, then press [ENTER] continue"
+  read
+  workonce 2>&1 | tee -a workers.log
+
+  echo "Verify all batches' statuses are 'live', then press [ENTER] to continue"
+  read
+
+}