RIT Jenkins CI merged last_known_good into demo_stable branch before …

…deployment
MRCIEU · Sep 14, 2023 · 1a99535 · 1a99535
2 parents 76a401e + 08a16f2
commit 1a99535
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/Jenkinsfile.demo b/Jenkinsfile.demo
@@ -16,7 +16,7 @@ pipeline {
         stage('Demo: Cypress tests') {
             agent {
                 docker {
-                    image 'cypress/included:13.0.0'
+                    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:13.0.0'
+                    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:13.0.0'
+                    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:13.0.0
+    docker run -it -v $PWD:/e2e -w /e2e cypress/included:13.2.0
 
 ## Warnings
 

diff --git a/cypress.example.env.json b/cypress.example.env.json
@@ -0,0 +1,4 @@
+{
+    "CREDENTIALS_USR": "",
+    "CREDENTIALS_PSW": ""
+}