Merge pull request #9 from eea/develop

Release 1.1.0
eea · Mar 27, 2023 · ef7aafe · ef7aafe
2 parents 1ef0853 + d366eb0
commit ef7aafe
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ 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).
 
+### [1.1.0](https://github.com/eea/volto-tags-block/compare/1.0.2...1.1.0) - 27 March 2023
+
+#### :hammer_and_wrench: Others
+
+- Release 1.1.0 [Alin Voinea - [`f6bff18`](https://github.com/eea/volto-tags-block/commit/f6bff18aab98ebe50c6ecbdb2631a73a88bab481)]
+- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`7b1576e`](https://github.com/eea/volto-tags-block/commit/7b1576e6af644222ea2a02e83a5b6422592f7318)]
 ### [1.0.2](https://github.com/eea/volto-tags-block/compare/1.0.1...1.0.2) - 13 December 2022
 
 #### :rocket: New Features
@@ -12,18 +18,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`aec4766`](https://github.com/eea/volto-tags-block/commit/aec4766fa2a08fc24e9090251dcd98e29282c607)]
-- yarn 3 [Alin Voinea - [`7086cbe`](https://github.com/eea/volto-tags-block/commit/7086cbe0ac57cc71fed897941c3b396451b139ac)]
-- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`f77979e`](https://github.com/eea/volto-tags-block/commit/f77979eff94aeb78c3d47ba9292f991bfc2e345d)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`fcaf2c8`](https://github.com/eea/volto-tags-block/commit/fcaf2c818a80a032501a37fdd9393de0474ab07e)]
-- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`0aec2c6`](https://github.com/eea/volto-tags-block/commit/0aec2c67bc1768d378bad484e8536306496dc0a7)]
-- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`a3f92fd`](https://github.com/eea/volto-tags-block/commit/a3f92fd8f482df8c35031962c2c36966b27f1c48)]
 ### [1.0.1](https://github.com/eea/volto-tags-block/compare/1.0.0...1.0.1) - 16 November 2022
 
 #### :hammer_and_wrench: Others
 
 - test(estlint): Fix .project.eslintrc.js [Alin Voinea - [`c3b1719`](https://github.com/eea/volto-tags-block/commit/c3b17192e7315da188575e1bd5d2e7aa1b656602)]
-- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`d87cf6a`](https://github.com/eea/volto-tags-block/commit/d87cf6a6c4770ef2e2fb44579c2743e38efbb8de)]
 ## [1.0.0](https://github.com/eea/volto-tags-block/compare/0.2.4...1.0.0) - 28 October 2022
 
 #### :nail_care: Enhancements
@@ -35,7 +34,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - Cleanup [Alin Voinea - [`94c3aaf`](https://github.com/eea/volto-tags-block/commit/94c3aaf2cbe981619275efc7850cb6fcce145aa9)]
 - Update dependencies [Alin Voinea - [`fd0e5f6`](https://github.com/eea/volto-tags-block/commit/fd0e5f61547ef6c5eb6ddbc6f19f43ba8a7faeef)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`dc423c6`](https://github.com/eea/volto-tags-block/commit/dc423c686d68d5c20bed1b3a6b5b26a83cbefc0c)]
 ### [0.2.4](https://github.com/eea/volto-tags-block/compare/0.2.3...0.2.4) - 30 June 2022
 
 ### [0.2.3](https://github.com/eea/volto-tags-block/compare/0.2.2...0.2.3) - 8 June 2022
@@ -53,7 +51,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`bd1e6bf`](https://github.com/eea/volto-tags-block/commit/bd1e6bf486953a485ef9435f75a5c662bfca1c9e)]
 ### [0.2.0](https://github.com/eea/volto-tags-block/compare/0.1.0...0.2.0) - 4 April 2022
 
 #### :rocket: New Features

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,9 +4,9 @@ pipeline {
   environment {
         GIT_NAME = "volto-tags-block"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu,prod-www.eea.europa.eu,circularity.eea.europa.eu,forest.eea.europa.eu,demo-kitkat.dev2aws.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,water.europa.eu-marine,biodiversity.europa.eu"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu,prod-www.eea.europa.eu,circularity.eea.europa.eu,forest.eea.europa.eu,demo-kitkat.dev2aws.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,water.europa.eu-marine,biodiversity.europa.eu,climate-adapt.eea.europa.eu,climate-energy.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu,www.eea.europa.eu-ims,www.eea.europa.eu-en"
         DEPENDENCIES = ""
-        VOLTO = "alpha"
+        VOLTO = ""
     }
 
   stages {
@@ -41,19 +41,19 @@ pipeline {
 
           "ES lint": {
             node(label: 'docker') {
-              sh '''docker run -i --rm --name="$BUILD_TAG-eslint" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha eslint'''
+              sh '''docker run -i --rm --name="$BUILD_TAG-eslint" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci eslint'''
             }
           },
 
           "Style lint": {
             node(label: 'docker') {
-              sh '''docker run -i --rm --name="$BUILD_TAG-stylelint" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha stylelint'''
+              sh '''docker run -i --rm --name="$BUILD_TAG-stylelint" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci stylelint'''
             }
           },
 
           "Prettier": {
             node(label: 'docker') {
-              sh '''docker run -i --rm --name="$BUILD_TAG-prettier" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha prettier'''
+              sh '''docker run -i --rm --name="$BUILD_TAG-prettier" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci prettier'''
             }
           }
         )
@@ -77,8 +77,8 @@ pipeline {
             node(label: 'docker') {
               script {
                 try {
-                  sh '''docker pull plone/volto-addon-ci:alpha'''
-                  sh '''docker run -i --name="$BUILD_TAG-volto" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha'''
+                  sh '''docker pull plone/volto-addon-ci'''
+                  sh '''docker run -i --name="$BUILD_TAG-volto" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci'''
                   sh '''rm -rf xunit-reports'''
                   sh '''mkdir -p xunit-reports'''
                   sh '''docker cp $BUILD_TAG-volto:/opt/frontend/my-volto-project/coverage xunit-reports/'''
@@ -126,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:alpha; 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=$VOLTO plone/volto-addon-ci:alpha 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 VOLTO=$VOLTO plone/volto-addon-ci cypress'''
                 } finally {
                   try {
                     sh '''rm -rf cypress-reports cypress-results cypress-coverage'''

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