From 4a48ffa4c404e37f7e8fc13e42872e54c759d5ff Mon Sep 17 00:00:00 2001 From: razvanMiu Date: Fri, 8 Jan 2021 15:23:18 +0200 Subject: [PATCH] Uncomment cypress tests --- Jenkinsfile | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 85431e0..f011a33 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 {