Merge develop to QA

.github/workflows/publishQA.yml

@@ -12,13 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        project: [BPL, OE, SE]
+        project: [OE, SE]
         stage: [cm_scripts_active, cm_webapp_active]
         include:
-        - project: BPL
-          ECR_REPOSITORY: BPL_ECR_REPOSITORY
-          AWS_ACCESS_KEY_ID: SE_AWS_ACCESS_KEY_ID
-          AWS_SECRET_ACCESS_KEY: SE_AWS_SECRET_ACCESS_KEY
         - project: OE
           ECR_REPOSITORY: OE_ECR_REPOSITORY
           AWS_ACCESS_KEY_ID: OE_AWS_ACCESS_KEY_ID
@@ -31,12 +27,6 @@ jobs:
           container_tag: qa-cron-latest
         - stage: cm_webapp_active
           container_tag: qa-latest
-        - project: BPL
-          stage: cm_scripts_active
-          cluster_service: BPL_SCRIPTS_CLUSTER_SERVICE
-        - project: BPL
-          stage: cm_webapp_active
-          cluster_service: BPL_WEBAPP_CLUSTER_SERVICE
         - project: OE
           stage: cm_scripts_active
           cluster_service: OE_SCRIPTS_CLUSTER_SERVICE

.github/workflows/test.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip install --upgrade pip
-          pip install tox tox-gh-actions tox-docker
+          pip install tox tox-gh-actions tox-docker==4.1.0 docker==6.1.3 -r requirements-dev.txt
 
       - name: Run Tests
         run: |

Dockerfile

@@ -57,9 +57,7 @@ COPY ./docker/localdev_postgres_init.sh /docker-entrypoint-initdb.d/localdev_pos
 #
 #   * We create a user, 'simplified', to be the non-root user we step down to
 #
-#   * We install NodeJS from the Nodesource packages, which lets us use Node 10,
-#     and avoids dependency conflicts between node and libxmlsec1 over the SSL
-#     library version that we'll get via system packages.
+#   * We install NodeJS from the Nodesource packages.
 #
 ###############################################################################
 
@@ -75,8 +73,8 @@ RUN apt-get update \
     ca-certificates \
     gnupg \
  && curl -sSL ${NODESOURCE_KEYFILE} | apt-key add - \
- && echo "deb https://deb.nodesource.com/node_14.x focal main" >> /etc/apt/sources.list.d/nodesource.list \
- && echo "deb-src https://deb.nodesource.com/node_14.x focal main" >> /etc/apt/sources.list.d/nodesource.list \
+ && echo "deb https://deb.nodesource.com/node_20.x jammy main" >> /etc/apt/sources.list.d/nodesource.list \
+ && echo "deb-src https://deb.nodesource.com/node_20.x jammy main" >> /etc/apt/sources.list.d/nodesource.list \
  && apt-get update \
  && apt-get install --yes --no-install-recommends \
     build-essential \