From 3f2c5ff4c6834bb95a5db93e8b7150c554fa253b Mon Sep 17 00:00:00 2001
From: Nathan Bockisch <nbockisc@nrao.edu>
Date: Wed, 20 Apr 2022 09:31:23 -0600
Subject: [PATCH] Added mounts for the vlass stash/cache areas to the workflow
 container locally and when deployed

---
 docker-compose.local.yml                          | 1 +
 docker-compose.yml                                | 1 +
 services/workflow/bin/boot-condor-and-workflow.sh | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/docker-compose.local.yml b/docker-compose.local.yml
index 22c2fe511..eb7dbfdb3 100644
--- a/docker-compose.local.yml
+++ b/docker-compose.local.yml
@@ -155,6 +155,7 @@ services:
       - ~/.capo:/home/ssa/capo
       - ~/.ssh:/home/vlapipe/.ssh
       - ./docker.properties:/home/ssa/capo/docker.properties
+      - ./stash/projects/vlass/cache:/stash/projects/vlass/cache
       - /packages/shared/workspaces/ssa_workspaces.egg-info
       - /packages/shared/schema/ssa_schema.egg-info
       - /packages/shared/messaging/ssa_messaging.egg-info
diff --git a/docker-compose.yml b/docker-compose.yml
index c2e43a546..3d53d134d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,6 +28,7 @@ services:
       - /lustre/aoc/cluster/pipeline/dsoc-${ENV}/downloads/nrao:/lustre/aoc/cluster/pipeline/dsoc-${ENV}/downloads/nrao
       - /lustre/aoc/cluster/pipeline/dsoc-${ENV}/workspaces:/lustre/aoc/cluster/pipeline/dsoc-${ENV}/workspaces
       - /lustre/aoc/cluster/pipeline/vlass_${ENV}:/lustre/aoc/cluster/pipeline/vlass_${ENV}
+      - /stash/projects/vlass/cache:/stash/projects/vlass/cache
       - /home/ssa/bin/python3.8:/home/ssa/bin/python3.8
       - /home/casa/capo:/home/casa/capo
       - /users/vlapipe/.ssh:/home/vlapipe/.ssh
diff --git a/services/workflow/bin/boot-condor-and-workflow.sh b/services/workflow/bin/boot-condor-and-workflow.sh
index 2d936670e..39cc2b648 100755
--- a/services/workflow/bin/boot-condor-and-workflow.sh
+++ b/services/workflow/bin/boot-condor-and-workflow.sh
@@ -45,6 +45,7 @@ WEBLOG_DIR=/lustre/aoc/cluster/pipeline/"$CAPO_PROFILE"/workspaces/cache
 IMAGE_QA_DIR=/lustre/aoc/cluster/pipeline/"$CAPO_PROFILE"/workspaces/image-qa
 STAGING_DIR=/lustre/aoc/cluster/pipeline/"$CAPO_PROFILE"/workspaces/staging
 STORAGE_DIR=/lustre/aoc/cluster/pipeline/"$CAPO_PROFILE"/workspaces/storage
+CACHE_DIR=/stash/projects/vlass/cache
 mkdir -p "$SPOOL_DIR"
 mkdir -p "$QA_DIR"
 mkdir -p "$WEBLOG_DIR"
@@ -52,6 +53,7 @@ mkdir -p "$WEBLOG_DIR/weblog"
 mkdir -p "$IMAGE_QA_DIR"
 mkdir -p "$STAGING_DIR"
 mkdir -p "$STORAGE_DIR"
+mkdir -p "$CACHE_DIR"
 
 # Copy wf_framework shell scripts to workflow dir
 echo "Copying wf_framework shell scripts to /lustre/aoc/cluster/pipeline/${CAPO_PROFILE}/workspaces/sbin"
-- 
GitLab