Merge branch '2.8.4-testing-tweaks' into '2.8.4-DEVELOPMENT'

fix a typo

See merge request !1671

shared/workspaces/alembic/versions/15d7b52aace4_update_restore_condor_templates.py

+"""update restore condor templates
+
+Revision ID: 15d7b52aace4
+Revises: fb911077e1e6
+Create Date: 2024-06-03 10:44:51.361713
+
+"""
+from pathlib import Path
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "15d7b52aace4"
+down_revision = "fb911077e1e6"
+branch_labels = None
+depends_on = None
+
+
+def set_content(wf_name: str, filename: str) -> str:
+    return (Path.cwd() / "versions" / "templates" / wf_name / filename).read_text()
+
+
+def upgrade():
+    op.execute(
+        f"""
+        UPDATE workflow_templates
+        SET content=E'{set_content("restore_cms", "envoy_condor_2.8.4.txt")}'
+        WHERE filename='restore_cms_envoy.condor'
+        """
+    )
+
+
+def downgrade():
+    op.execute(
+        f"""
+        UPDATE workflow_templates
+        SET content=E'{set_content("restore_cms", "lustre_only_envoy_2.7.txt")}'
+        WHERE filename='restore_cms_envoy.condor'
+        """
+    )

shared/workspaces/alembic/versions/templates/restore_cms/envoy_condor_2.8.4.txt

+executable = restore_cms_envoy.sh
+arguments = metadata.json PPR.xml
+
+output = envoy.out
+error = envoy.err
+log = condor.log
+
+should_transfer_files = NO
++WantIOProxy = True
+request_memory = {{ramInGb}}
+getenv = True
+
+environment = "CAPO_PATH=/home/casa/capo"
+requirements = HasLustre == True
+
+queue
+