From ea2eab4dac16ac5b6d67039a2f65188420d6ca6c Mon Sep 17 00:00:00 2001 From: razvanMiu Date: Wed, 17 Feb 2021 21:35:46 +0200 Subject: [PATCH] Commented cypress --- Jenkinsfile | 44 ++++++++++++++++++++++---------------------- package.json | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f011a336..85431e00 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,30 +49,30 @@ pipeline { } } - stage('Integration tests') { - steps { - parallel( + // stage('Integration tests') { + // steps { + // parallel( - "Cypress": { - 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 eeacms/eprtr-frontend; 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" eeacms/eprtr-frontend cypress''' - } finally { - sh '''mkdir -p cypress-reports''' - sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/cypress/videos cypress-reports/''' - stash name: "cypress-reports", includes: "cypress-reports/**/*" - archiveArtifacts artifacts: 'cypress-reports/videos/*.mp4', fingerprint: true - sh '''echo "$(docker stop $BUILD_TAG-plone; docker rm -v $BUILD_TAG-plone; docker rm -v $BUILD_TAG-cypress)" ''' - } - } - } - } + // "Cypress": { + // 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 eeacms/eprtr-frontend; 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" eeacms/eprtr-frontend cypress''' + // } finally { + // sh '''mkdir -p cypress-reports''' + // sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/cypress/videos cypress-reports/''' + // stash name: "cypress-reports", includes: "cypress-reports/**/*" + // archiveArtifacts artifacts: 'cypress-reports/videos/*.mp4', fingerprint: true + // sh '''echo "$(docker stop $BUILD_TAG-plone; docker rm -v $BUILD_TAG-plone; docker rm -v $BUILD_TAG-cypress)" ''' + // } + // } + // } + // } - ) - } - } + // ) + // } + // } stage('Upgrade demo') { when { diff --git a/package.json b/package.json index 5268b0a6..c83185b7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/eprtr_frontend", - "version": "1.4.3", + "version": "1.4.2", "description": "EPRTR: Industrial Emission Portal ", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team",