Ws 422 cache image

services/notification/requirements.txt

@@ -8,15 +8,3 @@
 -e ../packages/apps/cli/utilities/ws_metrics
 -e ../packages/apps/cli/executables/pexable/null
 -e ../packages/testing
-
-pycapo == 0.3.0
-pyramid == 1.10
-pyramid_beaker == 0.8
-pyramid_debugtoolbar == 4.5
-pyramid_retry == 2.1.1
-pyramid_tm == 2.2.1
-pytest == 5.4.3
-requests == 2.23
-sqlalchemy == 1.3.23
-waitress == 1.4
-zope.sqlalchemy == 1.1

services/notification/setup.py

@@ -46,7 +46,7 @@ requires = [
     "pyramid_retry",
     "requests",
     "ssa-schema",
-    "sqlalchemy",
+    "sqlalchemy==1.3.23",
     "waitress",
     "ssa-workspaces",
     "zope.sqlalchemy",

services/workflow/Dockerfile.dev

 # This is nrao:workflow
-FROM ssa-containers.aoc.nrao.edu/ops/base:workspaces
+ARG TAGNAME="tmp"
+FROM cache:${TAGNAME}
+
+USER root
 
 # HTCondor install
 RUN apt update && apt install -y wget gnupg sudo
@@ -26,23 +29,10 @@ USER vlapipe
 # set ownership of content to vlapipe and the vlapipe group
 COPY --chown=vlapipe:vlapipe ./services/workflow ./
 
-# Change working directory to /packages
-WORKDIR /packages/
-
-# Copy shared, apps/cli/, and testing directories to /packages
-# set ownership of content to vlapipe and the vlapipe group id
-COPY --chown=vlapipe:vlapipe ./shared ./shared
-COPY --chown=vlapipe:vlapipe ./apps/cli ./apps/cli
-COPY --chown=vlapipe:vlapipe ./testing ./testing
-
-# Change working directory to /code
-WORKDIR /code
-
 ENV PYTHONPATH "${PYTHONPATH}:/home/vlapipe/.local"
 ENV PATH "${PATH}:/home/vlapipe/.local/bin"
 
-RUN pip install --user -r requirements.txt \
-    && python setup.py develop --install-dir="~/.local"
+RUN python setup.py develop --user
 
 # Set Capo
 ARG capo_env=dsoc-dev

services/workflow/Dockerfile.local

 # Workflow service layer
 # This is nrao:workflow
-FROM ssa-containers.aoc.nrao.edu/ops/base:workspaces
+FROM cache:tmp
 
 # Get workflow code into the image
 WORKDIR /code
-COPY ./services/workflow ./
-
-WORKDIR /packages/
-COPY ./shared ./shared
-COPY ./apps/cli ./apps/cli
-COPY ./testing ./testing
+COPY --chown=vlapipe:vlapipe ./services/workflow ./
 
 # Python library installation
 WORKDIR /code/
-RUN pip install -r requirements.txt && python setup.py develop
+USER vlapipe
+RUN python setup.py develop --user
+
+USER root
 
 # HTCondor install
 RUN apt update && apt install -y wget gnupg sudo

services/workflow/bin/boot-condor-and-workflow.sh

@@ -29,11 +29,4 @@ chown root:vlapipe "$WORKFLOW_DIR"/*
 chmod 777 "$WORKFLOW_DIR"
 chmod 777 "$WORKFLOW_DIR"/*
 
-if [ "$CAPO_PROFILE" = "dsoc-dev" ] || [ "$CAPO_PROFILE" = "dsoc-test" ]
-then
-  # If on dev or test, boot workflow as vlapipe
-  su vlapipe -c "/code/bin/boot-workflow.sh"
-else
-  # If local, just boot as root
-  /code/bin/boot-workflow.sh
-fi
+su vlapipe -c "/code/bin/boot-workflow.sh"

services/workflow/bin/run-tests.sh

@@ -14,10 +14,8 @@ skip_arg="--skip-empty"
 
 # Install testing requirements
 init () {
-  pip install --user -r /packages/testing/requirements.txt
-
   pushd /packages/testing
-  python setup.py develop
+  python setup.py develop --user
   popd
 
 #  if exists, remove old .coverage file

services/workflow/requirements.txt

@@ -14,19 +14,3 @@
 -e ../packages/apps/cli/executables/pexable/null
 -e ../packages/apps/cli/executables/vela
 -e ../packages/testing
-
-psycopg2 >= 2.8.5,<3.0
-pycapo == 0.3.1
-py-dag == 3.0.1
-pyramid == 1.10
-pyramid_beaker == 0.8
-pyramid_debugtoolbar == 4.5
-pyramid_retry == 2.1.1
-pyramid_tm == 2.2.1
-pytest == 5.4.3
-pytest-resource-path == 1.2.1
-requests == 2.23
-requests_mock == 1.9.2
-sqlalchemy == 1.3.23
-waitress == 1.4
-zope.sqlalchemy == 1.1

services/workflow/setup.py

@@ -46,7 +46,7 @@ requires = [
     "pyramid_retry",
     "requests",
     "ssa-schema",
-    "sqlalchemy",
+    "sqlalchemy==1.3.23",
     "waitress",
     "ssa-workspaces",
     "zope.sqlalchemy",

shared/schema/setup.py

@@ -19,7 +19,7 @@ setup(
     license="GPL",
     install_requires=[
         "pendulum==2.1.2",
-        "sqlalchemy",
+        "sqlalchemy==1.3.23",
         "pycapo",
         "psycopg2",
         "mysqlclient",

shared/workspaces/setup.py

@@ -12,7 +12,7 @@ requires = [
     "pycapo",
     "marshmallow",
     "ssa-schema",
-    "sqlalchemy",
+    "sqlalchemy==1.3.23",
     "cx-Oracle",
     "chevron",
     "requests",

testing/requirements.txt

@@ -13,10 +13,3 @@
 -e ../packages/apps/cli/executables/pexable/null
 -e ../packages/apps/cli/executables/pexable/casa_envoy
 -e ../packages/apps/cli/executables/tmpdir_eraser
-
-pytest>=5.4,<6.0
-pendulum==2.1.2
-pytest-mock==3.3.1
-behave==1.2.6
-pytest-cov==2.11
-mock_alchemy==0.2.1