From 45498ed5c33d834d887866d5b1d37b87c5f76eb4 Mon Sep 17 00:00:00 2001 From: valentinab25 Date: Tue, 12 Apr 2022 20:14:18 +0300 Subject: [PATCH 1/6] [JENKINS] Use NodeJS 16 for sonarqube - Refs #111286 --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f08a57f..1170f5d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -184,10 +184,10 @@ pipeline { unstash "xunit-reports" unstash "cypress-coverage" def scannerHome = tool 'SonarQubeScanner'; - def nodeJS = tool 'NodeJS11'; + def nodeJS = tool 'NodeJS'; withSonarQubeEnv('Sonarqube') { sh '''sed -i "s#/opt/frontend/my-volto-project/src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info''' - sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER" + sh "export PATH=${scannerHome}/bin:${nodeJS}/bin:$PATH; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER" sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done''' } } From 5a818f5ab409e0b67ffb820e03c5f440a2b51e16 Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Tue, 28 Jun 2022 13:58:36 +0300 Subject: [PATCH 2/6] Add Sonarqube tag using circularity-frontend addons list --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1170f5d..d26faf2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { environment { GIT_NAME = "volto-banner" NAMESPACE = "@eeacms" - SONARQUBE_TAGS = "volto.eea.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,forest.eea.europa.eu,biodiversity.europa.eu,clms.land.copernicus.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu" + SONARQUBE_TAGS = "volto.eea.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,forest.eea.europa.eu,biodiversity.europa.eu,clms.land.copernicus.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,circularity.eea.europa.eu" DEPENDENCIES = "" } From c9ff091ddd2230d23ffd360019a4b6fd42f943eb Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Thu, 30 Jun 2022 19:03:55 +0300 Subject: [PATCH 3/6] [JENKINS] - Use Document for cypress sandbox --- Jenkinsfile | 4 ++-- cypress/support/index.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d26faf2..b4e1fc8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -124,8 +124,8 @@ pipeline { node(label: 'docker') { script { try { - 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''' + sh '''docker pull eeacms/plone-backend; docker run --rm -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="eea.kitkat:testing" eeacms/plone-backend''' + 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" -e VOLTO=alpha plone/volto-addon-ci cypress''' } finally { try { sh '''rm -rf cypress-reports cypress-results cypress-coverage''' diff --git a/cypress/support/index.js b/cypress/support/index.js index 89aab00..32395ab 100644 --- a/cypress/support/index.js +++ b/cypress/support/index.js @@ -27,7 +27,7 @@ coverage-end */ export const setupBeforeEach = () => { cy.autologin(); cy.createContent({ - contentType: 'Folder', + contentType: 'Document', contentId: 'cypress', contentTitle: 'Cypress', }); From 2a222c6d6256f1b8b91a2e4c96fc3f2dbee14bbb Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Thu, 30 Jun 2022 19:42:39 +0300 Subject: [PATCH 4/6] [JENKINS] - Use the latest Volto alpha release --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b4e1fc8..42fee2b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,6 +6,7 @@ pipeline { NAMESPACE = "@eeacms" SONARQUBE_TAGS = "volto.eea.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,forest.eea.europa.eu,biodiversity.europa.eu,clms.land.copernicus.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,circularity.eea.europa.eu" DEPENDENCIES = "" + VOLTO = "alpha" } stages { @@ -125,7 +126,7 @@ pipeline { script { try { sh '''docker pull eeacms/plone-backend; docker run --rm -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="eea.kitkat:testing" eeacms/plone-backend''' - 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" -e VOLTO=alpha plone/volto-addon-ci cypress''' + 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" -e NODE_ENV=development -e VOLTO="$VOLTO" plone/volto-addon-ci cypress''' } finally { try { sh '''rm -rf cypress-reports cypress-results cypress-coverage''' From 5cf15525c65cdddd211eea937c0b0db63d99049f Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Thu, 30 Jun 2022 20:14:45 +0300 Subject: [PATCH 5/6] [JENKINS] - Use the latest Volto alpha release --- cypress.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cypress.json b/cypress.json index aef675e..736dedd 100644 --- a/cypress.json +++ b/cypress.json @@ -1,9 +1,14 @@ { "baseUrl": "http://localhost:3000", "viewportWidth": 1280, - "defaultCommandTimeout": 15000, + "defaultCommandTimeout": 8888, + "chromeWebSecurity": false, "reporter": "junit", "video": true, + "retries": { + "runMode": 8, + "openMode": 0 + }, "reporterOptions": { "mochaFile": "cypress/reports/cypress-[hash].xml", "jenkinsMode": true, From 6d15e7d84a80874c8e30aee7c7a435e456616017 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Thu, 30 Jun 2022 17:50:15 +0000 Subject: [PATCH 6/6] Automated release 2.2.1 --- CHANGELOG.md | 7 ++++++- package.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bd35b2..1ba6e08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,15 @@ 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). +#### [2.2.1](https://github.com/eea/volto-banner/compare/2.2.0...2.2.1) + + #### [2.2.0](https://github.com/eea/volto-banner/compare/2.1.0...2.2.0) +> 8 April 2022 + +- Apply has-banner class only if the banner is visible [`#18`](https://github.com/eea/volto-banner/pull/18) - Bumped to version 2.2 [`e1043a1`](https://github.com/eea/volto-banner/commit/e1043a1727fb717690f20b106508207ea83f2781) -- Apply has-banner class only if the banner is visible [`9c0792b`](https://github.com/eea/volto-banner/commit/9c0792ba0d7aa6891fc02f31dbe35a94cb320a28) #### [2.1.0](https://github.com/eea/volto-banner/compare/2.0.0...2.1.0) diff --git a/package.json b/package.json index c058572..cacce21 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-banner", - "version": "2.2.0", + "version": "2.2.1", "description": "@eeacms/volto-banner: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team",