Merge pull request #85 from eea/develop

[JENKINS] Refs #142010 - Do not save successfull test videos
eea · Jan 3, 2022 · ea0bd67 · ea0bd67
2 parents ae23ffb + 4c067b9
commit ea0bd67
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [4.5.7](https://github.com/eea/volto-block-data-figure/compare/4.5.6...4.5.7)
+
+
 #### [4.5.6](https://github.com/eea/volto-block-data-figure/compare/4.5.5...4.5.6)
 
-- Update cypress tests to work also with slate [`6cc97aa`](https://github.com/eea/volto-block-data-figure/commit/6cc97aa9674fcba71d87e6d377e0ad945f339bb7)
+> 23 December 2021
+
+- Update cypress tests to work also with slate [`#84`](https://github.com/eea/volto-block-data-figure/pull/84)
 
 #### [4.5.5](https://github.com/eea/volto-block-data-figure/compare/4.5.4...4.5.5)
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -124,7 +124,7 @@ pipeline {
             node(label: 'docker') {
               script {
                 try {
-                  sh '''docker pull plone; docker run -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="profile-plone.restapi:blocks" plone fg'''
+                  sh '''docker pull plone; docker run -d --rm --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="profile-plone.restapi:blocks" plone fg'''
                   sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" plone/volto-addon-ci cypress'''
                 } finally {
                   try {
@@ -142,7 +142,8 @@ pipeline {
                              reportName: 'CypressCoverage',
                              reportTitles: 'Integration Tests Code Coverage'])
                     }
-                    archiveArtifacts artifacts: 'cypress-reports/videos/*.mp4', fingerprint: true
+                    sh '''touch empty_file; for ok_test in $(grep -E 'file=.*failures="0"' $(grep 'testsuites .*failures="0"' $(find cypress-results -name *.xml) empty_file | awk -F: '{print $1}') empty_file | sed 's/.* file="\\(.*\\)" time.*/\\1/' | sed 's#^cypress/integration/##g' | sed 's#^../../../node_modules/@eeacms/##g'); do rm -f cypress-reports/videos/$ok_test.mp4; rm -f cypress-reports/$ok_test.mp4; done'''
+                    archiveArtifacts artifacts: 'cypress-reports/**/*.mp4', fingerprint: true, allowEmptyArchive: true
                     stash name: "cypress-coverage", includes: "cypress-coverage/**", allowEmpty: true
                   }
                   finally {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-block-data-figure",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "volto-block-data-figure: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",