Merge branch 'master' into TMMA-440

MRCIEU · Sep 15, 2023 · c8c3f0f · c8c3f0f
2 parents 0a36e74 + 42b156c
commit c8c3f0f
Show file tree

Hide file tree

Showing 16 changed files with 269 additions and 257 deletions.
diff --git a/.github/workflows/check-python-dependcies.yml b/.github/workflows/check-python-dependcies.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Python 2 support
       run: |
         sudo apt-get update
@@ -40,7 +40,7 @@ jobs:
       with:
         branch: python-package-updates
         title: Pending python dependency updates
-        # path: lib/test/src/temmpo/
         commit-message: "Automated pip-tools & GitHub Action generated python dependency updates"
         body: "Automated python dependency updates by pip-tools and [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action"
-        reviewers: asset-web
+        assignees: asset-web
+    # TMMA-465 Workaround bug triggering follow on workflows, ref: https://github.com/peter-evans/create-pull-request/blob/v5/docs/concepts-guidelines.md#triggering-further-workflow-runs
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -4,6 +4,7 @@ name: Docker build
 # Or can be triggered manualy
 on:
   workflow_dispatch:
+  pull_request:
   push:
     paths:
       # TODO: Review scope of GitHub action grows
@@ -21,7 +22,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Record Docker version
         run: docker -v
       - uses: whoan/docker-build-with-cache-action@v6

diff --git a/.github/workflows/run-django-test.yml b/.github/workflows/run-django-test.yml
@@ -7,7 +7,6 @@ on:
       - demo_stable
       - prod_stable
   pull_request:
-    types: [review_requested]
   workflow_dispatch:
 
 jobs:
@@ -25,7 +24,7 @@ jobs:
         env:
           MYSQL_ROOT_PASSWORD: 'ci-db-pswd'
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Python 2 support
       run: |
         sudo apt-get update

diff --git a/.github/workflows/run-fabric-test.yml b/.github/workflows/run-fabric-test.yml
@@ -7,14 +7,13 @@ on:
       - demo_stable
       - prod_stable
   pull_request:
-    types: [review_requested]
   workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Python 2 support
       run: |
         sudo apt-get update

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,9 @@
+8.5.2   Upgrade Cypress
+
+8.5.1   Update Cypress
+
+8.5.0   Apply Python updates
+
 8.4.1   Apply Python updates
         Update GitHub actions
 

diff --git a/Jenkinsfile.demo b/Jenkinsfile.demo
@@ -16,7 +16,7 @@ pipeline {
         stage('Demo: Cypress tests') {
             agent {
                 docker {
-                    image 'cypress/included:12.17.1'
+                    image 'cypress/included:13.2.0'
                     args '--add-host py-web-d0.epi.bris.ac.uk:172.25.2.76 --entrypoint=""'
                 }
             }

diff --git a/Jenkinsfile.prod b/Jenkinsfile.prod
@@ -17,7 +17,7 @@ pipeline {
         stage('Production: Cypress tests') {
             agent {
                 docker {
-                    image 'cypress/included:12.17.1'
+                    image 'cypress/included:13.2.0'
                     args '--add-host temmpo.org.uk:172.25.2.104 --entrypoint=""'
                 }
             }

diff --git a/Jenkinsfile.test b/Jenkinsfile.test
@@ -16,7 +16,7 @@ pipeline {
         stage('Test: Cypress tests') {
             agent {
                 docker {
-                    image 'cypress/included:12.17.1'
+                    image 'cypress/included:13.2.0'
                     args '--add-host py-web-t0.epi.bris.ac.uk:172.25.2.77 --entrypoint=""'
                 }
             }

diff --git a/README.md b/README.md
@@ -196,13 +196,13 @@ e.g. Run selenium tests only
 
 Using a locally instally node environment
 
-NB: Some tests require these environment variables `CREDENTIALS_USR` and `CREDENTIALS_PSW` to be defined, to be able log into the site being tested.
+NB: Some tests require these environment variables `CREDENTIALS_USR` and `CREDENTIALS_PSW` to be defined, to be able log into the site being tested.  These details can be found in Research IT's LastPass account.  Based on the `cypress.example.env.json` create a `cypress.env.json` file and fill in the details required from LastPass.
 
     npx cypress open
 
 Using docker and electron browser
 
-    docker run -it -v $PWD:/e2e -w /e2e cypress/included:12.17.1
+    docker run -it -v $PWD:/e2e -w /e2e cypress/included:13.2.0
 
 ## Warnings
 

diff --git a/cypress.config.js b/cypress.config.js
@@ -5,5 +5,7 @@ module.exports = defineConfig({
     baseUrl: 'https://py-web-d0.epi.bris.ac.uk',
     supportFile: false,
     specPattern: 'cypress/integration/*.js',
+    video: true,
+    videoCompression: false,
   },
 })
diff --git a/cypress.example.env.json b/cypress.example.env.json
@@ -0,0 +1,4 @@
+{
+    "CREDENTIALS_USR": "",
+    "CREDENTIALS_PSW": ""
+}
diff --git a/deploy/Dockerfile b/deploy/Dockerfile
@@ -1,11 +1,12 @@
-FROM python:3.8.17-slim
+FROM python:3.8.18-slim
 
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
 ENV PIP_VERSION='23.2.1'
-ENV SETUPTOOLS_VERSION='68.0.0'
-ENV PIP_TOOLS_VERSION='7.2.0'
-ENV VE_VERSION='20.24.2'
+ENV SETUPTOOLS_VERSION='68.1.2'
+ENV PIP_TOOLS_VERSION='7.3.0'
+# As per Centos installation
+ENV VE_VERSION='20.13.0'
 
 # Update system packages and install dependencies
 RUN apt update -y && \

diff --git a/deploy/fabfile.py b/deploy/fabfile.py
@@ -22,8 +22,8 @@
 # Tools not handled by pip-tools and/or requirements installs using pip
 # Also update tests/run-django-tests.sh
 PIP_VERSION = '23.2.1'
-SETUPTOOLS_VERSION = '68.0.0'
-PIP_TOOLS_VERSION = '7.2.0'
+SETUPTOOLS_VERSION = '68.1.2'
+PIP_TOOLS_VERSION = '7.3.0'
 
 
 def _add_file_local(path, contents, use_local_mode):