Skip to content

Commit

Permalink
Merge pull request #17 from eea/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
rexalex authored Mar 16, 2023
2 parents 009c61d + 8dd990e commit 0eb622a
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 121 deletions.
60 changes: 4 additions & 56 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

- feat: implement newsletter form route Refs #158655 [Mimi - [`c6c2c05`](https://github.com/eea/advisory-board-frontend/commit/c6c2c059a773cde747c10931b1fa9d84f58e395c)]

#### :rocket: Dependency updates


#### :house: Internal changes

- chore: remove integration tests [Alexandru Medesan - [`f84aeb7`](https://github.com/eea/advisory-board-frontend/commit/f84aeb79b034089d40fcf55221d4feffe9d4f386)]
- chore: merge develop [Mimi - [`1312903`](https://github.com/eea/advisory-board-frontend/commit/1312903bfb72b590479e11a62ea2c30b2dc571a7)]

#### :hammer_and_wrench: Others
Expand All @@ -21,18 +25,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :rocket: Dependency updates

- Release @eeacms/volto-nextcloud-video-block@0.3.0 [EEA Jenkins - [`972da88`](https://github.com/eea/advisory-board-frontend/commit/972da88727b55e9d05903c851cba86b3c52fc181)]
- Release @eeacms/volto-eea-website-theme@1.11.2 [EEA Jenkins - [`b5477ef`](https://github.com/eea/advisory-board-frontend/commit/b5477ef089a279e9e684807cc2b16119e5c24533)]

### [0.8.0](https://github.com/eea/advisory-board-frontend/compare/0.7.0...0.8.0) - 15 March 2023

#### :rocket: Dependency updates

- Release @eeacms/volto-climate-advisory-board-policy@0.1.4 [EEA Jenkins - [`a61c7a4`](https://github.com/eea/advisory-board-frontend/commit/a61c7a46eeb231a07f66b4c0e3c474e94708a896)]
- Release @eeacms/volto-eea-design-system@1.0.2 [EEA Jenkins - [`a03f101`](https://github.com/eea/advisory-board-frontend/commit/a03f10180409a730261c538cd0f8c649760268d2)]
- Release @eeacms/volto-eea-website-theme@1.11.1 [EEA Jenkins - [`7913466`](https://github.com/eea/advisory-board-frontend/commit/79134661401e4b5f3c879fa60b059591eaebe61f)]
- Release @eeacms/volto-climate-advisory-board-policy@0.1.3 [EEA Jenkins - [`0874e15`](https://github.com/eea/advisory-board-frontend/commit/0874e15bcf861f00c0c78b8223cdb36a4a9a1a96)]
- Release @eeacms/volto-climate-advisory-board-policy@0.1.2 [EEA Jenkins - [`25babb8`](https://github.com/eea/advisory-board-frontend/commit/25babb8a441562c2cdeeec27aa02484c9ce8b434)]

#### :bug: Bug Fixes

Expand All @@ -59,28 +56,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :rocket: Dependency updates

- Release @eeacms/volto-eea-website-theme@1.11.0 [EEA Jenkins - [`c2bec76`](https://github.com/eea/advisory-board-frontend/commit/c2bec76c8226abf23731adbf7fd10f1cea0058dc)]
- Release @eeacms/volto-eea-website-theme@1.11.0 [EEA Jenkins - [`8b7974e`](https://github.com/eea/advisory-board-frontend/commit/8b7974e68835e8f576db53e0f1b4d7073366c733)]
- Release @eeacms/volto-eea-kitkat@13.0.0 [EEA Jenkins - [`1f985d9`](https://github.com/eea/advisory-board-frontend/commit/1f985d92b32aeeeb0a83b589b0b6b653c12a149f)]
- Release @eeacms/volto-eea-kitkat@13.0.0 [EEA Jenkins - [`873e1bc`](https://github.com/eea/advisory-board-frontend/commit/873e1bcfe407037cb72bea6bc315bec8daba6398)]
- Release @eeacms/volto-eea-website-theme@1.10.0 [EEA Jenkins - [`c23f46a`](https://github.com/eea/advisory-board-frontend/commit/c23f46abac38717936476ada4428c89102641169)]
- Release @eeacms/volto-eea-website-theme@1.10.0 [EEA Jenkins - [`495e163`](https://github.com/eea/advisory-board-frontend/commit/495e163e037c77520b300ae5826792680c49e08f)]
- Release @eeacms/volto-eea-website-theme@1.9.3 [EEA Jenkins - [`c33d4e8`](https://github.com/eea/advisory-board-frontend/commit/c33d4e8a3db3ac31f4480e3d6f7c29b1342c2a03)]
- Release @eeacms/volto-eea-website-theme@1.9.3 [EEA Jenkins - [`7b43a73`](https://github.com/eea/advisory-board-frontend/commit/7b43a735bdb6079f423d363b1d53efcebef4a1e1)]
- Release @eeacms/volto-eea-kitkat@12.1.0 [EEA Jenkins - [`ae3f09e`](https://github.com/eea/advisory-board-frontend/commit/ae3f09e2882f8f638b2b1bce46ed9e720b33bf21)]
- Release @eeacms/volto-eea-kitkat@12.1.0 [EEA Jenkins - [`fc30129`](https://github.com/eea/advisory-board-frontend/commit/fc30129984f9a8e99c4c9a529bf55e6af14adb42)]
- Release @eeacms/volto-eea-website-theme@1.9.2 [EEA Jenkins - [`0a3768e`](https://github.com/eea/advisory-board-frontend/commit/0a3768e5a17b26124e018265727def6d5f7071d4)]
- Release @eeacms/volto-eea-website-theme@1.9.2 [EEA Jenkins - [`35b16a3`](https://github.com/eea/advisory-board-frontend/commit/35b16a3c649f88b957ebf6e2e64735ae019dd31e)]
- Release @eeacms/volto-eea-kitkat@12.0.3 [EEA Jenkins - [`251e917`](https://github.com/eea/advisory-board-frontend/commit/251e91762f24eecd8e4389c5900764b86dd2dd81)]
- Release @eeacms/volto-eea-kitkat@12.0.3 [EEA Jenkins - [`f0c980f`](https://github.com/eea/advisory-board-frontend/commit/f0c980f918613e63d9b940f3cf5769db2dda8c23)]
- Release @eeacms/volto-eea-kitkat@12.0.2 [EEA Jenkins - [`710777b`](https://github.com/eea/advisory-board-frontend/commit/710777b03df8f10c7bfab7b4e7fc1fb9c828a389)]
- Release @eeacms/volto-eea-kitkat@12.0.2 [EEA Jenkins - [`d7f883e`](https://github.com/eea/advisory-board-frontend/commit/d7f883ec9a748ba61ef28eb92f3da2446ca7728b)]
- Release @eeacms/volto-eea-website-theme@1.9.1 [EEA Jenkins - [`3a30468`](https://github.com/eea/advisory-board-frontend/commit/3a30468e7d9031ce2c195f270902dc316b2abd2c)]
- Release @eeacms/volto-eea-website-theme@1.9.1 [EEA Jenkins - [`4acb871`](https://github.com/eea/advisory-board-frontend/commit/4acb87180e67850face6de1f425dc6107fc1c45e)]
- Release @eeacms/volto-eea-kitkat@12.0.1 [EEA Jenkins - [`dee8ace`](https://github.com/eea/advisory-board-frontend/commit/dee8ace6f1c45d2038fd887f5c38b7de56515985)]
- Release @eeacms/volto-eea-kitkat@12.0.1 [EEA Jenkins - [`b75e02d`](https://github.com/eea/advisory-board-frontend/commit/b75e02d55263e78b9f147e5cf7c45296f5b7c9ae)]
- Release @eeacms/volto-eea-website-theme@1.9.0 [EEA Jenkins - [`29a0953`](https://github.com/eea/advisory-board-frontend/commit/29a09531d9f609ba187db93ec31385f3bb676c6d)]
- Release @eeacms/volto-eea-website-theme@1.9.0 [EEA Jenkins - [`1a65fd9`](https://github.com/eea/advisory-board-frontend/commit/1a65fd92b686e7d4aef0a6fe50de44c492f1f391)]

#### :house: Internal changes

Expand All @@ -102,25 +77,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :rocket: Dependency updates

- Release @eeacms/volto-climate-advisory-board-policy@0.1.1 [EEA Jenkins - [`2df5f3e`](https://github.com/eea/advisory-board-frontend/commit/2df5f3e10757e23a754d38eb2f71530935f8194b)]
- Release @eeacms/volto-eea-website-theme@1.8.2 [EEA Jenkins - [`897e06d`](https://github.com/eea/advisory-board-frontend/commit/897e06d1a3dd219350b21fb6ed90095824f8f378)]
- Release @eeacms/volto-eea-website-theme@1.8.1 [EEA Jenkins - [`f08fe0f`](https://github.com/eea/advisory-board-frontend/commit/f08fe0fb8062155255f2367a97b8fbc7bbcf7f04)]
- Release @eeacms/volto-eea-kitkat@12.0.0 [EEA Jenkins - [`92edbf5`](https://github.com/eea/advisory-board-frontend/commit/92edbf572f320e45eac6fe4d916ae6cdbf977d95)]
- Release @eeacms/volto-eea-website-theme@1.8.0 [EEA Jenkins - [`0215509`](https://github.com/eea/advisory-board-frontend/commit/0215509066f38b5b066ba5d3e5afb6df798d9dff)]
- Release @eeacms/volto-eea-website-theme@1.7.0 [EEA Jenkins - [`7b8fcf1`](https://github.com/eea/advisory-board-frontend/commit/7b8fcf1e37d7a9f55e1313de1fc9031dbf09b70b)]
- Release @eeacms/volto-eea-kitkat@11.0.0 [EEA Jenkins - [`147f452`](https://github.com/eea/advisory-board-frontend/commit/147f4524ab9657a178ad53ece5e37f97b806af07)]
- Release @eeacms/volto-eea-website-theme@1.6.4 [EEA Jenkins - [`526e092`](https://github.com/eea/advisory-board-frontend/commit/526e0920140d83e27b651566f853ad706438238c)]
- Release @eeacms/volto-eea-website-theme@1.6.3 [EEA Jenkins - [`d1092db`](https://github.com/eea/advisory-board-frontend/commit/d1092db7d0fe907275b08c6be80cb1c2d19f7857)]
- Release @eeacms/volto-eea-kitkat@10.6.1 [EEA Jenkins - [`a138a32`](https://github.com/eea/advisory-board-frontend/commit/a138a328336924e0eb60cf380ac97d25a0c547c9)]
- Release @eeacms/volto-eea-website-theme@1.6.2 [EEA Jenkins - [`06c99e9`](https://github.com/eea/advisory-board-frontend/commit/06c99e9afc1b32392b00f542899c2c7477f0ddeb)]
- Release @eeacms/volto-eea-kitkat@10.6.0 [EEA Jenkins - [`c2c1d45`](https://github.com/eea/advisory-board-frontend/commit/c2c1d45eb166771d1b87fea5203344f0a69205a2)]
- Release @eeacms/volto-eea-website-theme@1.6.1 [EEA Jenkins - [`3ac282a`](https://github.com/eea/advisory-board-frontend/commit/3ac282af45c52ecfc4d3421a1dac6bbe38fd98f5)]
- Release @eeacms/volto-eea-kitkat@10.5.5 [EEA Jenkins - [`aeac10e`](https://github.com/eea/advisory-board-frontend/commit/aeac10ee500621fd8b57dd3743ee3d9d10cbccf3)]
- Release @eeacms/volto-eea-website-theme@1.6.0 [EEA Jenkins - [`438f6ee`](https://github.com/eea/advisory-board-frontend/commit/438f6ee1036b4d49255391f55f9d129b41f9bfe0)]
- Release @eeacms/volto-eea-website-theme@1.5.1 [EEA Jenkins - [`4ff74ae`](https://github.com/eea/advisory-board-frontend/commit/4ff74ae7d403f24c42faaf8e86ccda5f45c019b9)]
- Release @eeacms/volto-eea-kitkat@10.5.1 [EEA Jenkins - [`5986a7a`](https://github.com/eea/advisory-board-frontend/commit/5986a7a6cbac175b831e81cb1f3b2d20eb13891b)]
- Release @eeacms/volto-eea-kitkat@10.5.0 [EEA Jenkins - [`ba9ccb2`](https://github.com/eea/advisory-board-frontend/commit/ba9ccb2be0652d7a2a0e9419391d64cbbfbf33d5)]
- Release @eeacms/volto-eea-website-theme@1.5.0 [EEA Jenkins - [`8ee791a`](https://github.com/eea/advisory-board-frontend/commit/8ee791a2e923e61d53212aaf8e13ac826db20b7c)]

#### :house: Internal changes

Expand All @@ -133,10 +89,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :rocket: Dependency updates

- Release @eeacms/volto-eea-website-theme@1.4.2 [EEA Jenkins - [`c31ff08`](https://github.com/eea/advisory-board-frontend/commit/c31ff08d760d595b0a02d1c1127b1c801fe9ebee)]
- Release @eeacms/volto-eea-website-theme@1.4.1 [EEA Jenkins - [`ec9196c`](https://github.com/eea/advisory-board-frontend/commit/ec9196c230f40503599293e3ec414640e10e940e)]
- Release @eeacms/volto-eea-kitkat@10.4.0 [EEA Jenkins - [`7316fc5`](https://github.com/eea/advisory-board-frontend/commit/7316fc5fc5b9d0ff50aeda16805e159efed572b8)]
- Release @eeacms/volto-eea-website-theme@1.4.0 [EEA Jenkins - [`65b960c`](https://github.com/eea/advisory-board-frontend/commit/65b960ccd72cf85c1bbd04aa777d25a8a5cca242)]

#### :bug: Bug Fixes

Expand All @@ -157,14 +109,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- Release 0.3.0 [Alin Voinea - [`44d6215`](https://github.com/eea/advisory-board-frontend/commit/44d6215a6e6f78a711070179c7706d2f65630f4c)]
- test(Jenkinsfile): Auto upgrade dev/demo on rancher on release [Alin Voinea - [`0cefb80`](https://github.com/eea/advisory-board-frontend/commit/0cefb80fdd1e50dcc29d9895a8e04b1e1086b002)]
- Make entrypoint.sh exec [Alin Voinea - [`cc31ccd`](https://github.com/eea/advisory-board-frontend/commit/cc31ccd8f14a5f7b54bbc5023f0998771bde8f97)]
### [0.2.0](https://github.com/eea/advisory-board-frontend/compare/0.1.0...0.2.0) - 16 December 2022

#### :rocket: Dependency updates

- Release @eeacms/volto-eea-kitkat@10.3.0 [EEA Jenkins - [`c2ab63b`](https://github.com/eea/advisory-board-frontend/commit/c2ab63b492b093ae01868dd6edad7c2314df1c4c)]
- Release @eeacms/volto-eea-website-theme@1.3.2 [EEA Jenkins - [`6858347`](https://github.com/eea/advisory-board-frontend/commit/6858347a60d901a04ceb550763c9edc58d1ee7b5)]

#### :hammer_and_wrench: Others

Expand All @@ -182,7 +131,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add empty CHANGELOG.md file [EEA Jenkins - [`8efbb6f`](https://github.com/eea/advisory-board-frontend/commit/8efbb6f2ab431d39c1527c07fb3d0d8ccd83b375)]
- Update package.json [Alexandru Ghica - [`b8d0323`](https://github.com/eea/advisory-board-frontend/commit/b8d03230e917d10d831d41def377fddf5f2db4a8)]
- Add cypress dev dependencies [Alin Voinea - [`6a60790`](https://github.com/eea/advisory-board-frontend/commit/6a607904b439fc48a9bea99cffd3841b39f1f820)]
- Cleanup [Alin Voinea - [`e0c29cd`](https://github.com/eea/advisory-board-frontend/commit/e0c29cd796db27201e678941ea16687389140a51)]
Expand Down
106 changes: 53 additions & 53 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,62 +14,62 @@ pipeline {

stages {

stage('Integration tests') {
when {
allOf {
environment name: 'CHANGE_ID', value: ''
anyOf {
not { changelog '.*^Automated release [0-9\\.]+$' }
branch 'master'
}
}
}
steps {
parallel(
// stage('Integration tests') {
// when {
// allOf {
// environment name: 'CHANGE_ID', value: ''
// anyOf {
// not { changelog '.*^Automated release [0-9\\.]+$' }
// branch 'master'
// }
// }
// }
// steps {
// parallel(

"Cypress": {
node(label: 'docker') {
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 eeacms/volto-project-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" eeacms/volto-project-ci'''
} finally {
try {
sh '''rm -rf cypress-reports cypress-results cypress-coverage'''
sh '''mkdir -p cypress-reports cypress-results cypress-coverage'''
sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/cypress/videos cypress-reports/'''
sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/cypress/reports cypress-results/'''
coverage = sh script: '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/coverage cypress-coverage/''', returnStatus: true
if ( coverage == 0 ) {
publishHTML (target : [allowMissing: false,
alwaysLinkToLastBuild: true,
keepAll: true,
reportDir: 'cypress-coverage/coverage/lcov-report',
reportFiles: 'index.html',
reportName: 'CypressCoverage',
reportTitles: 'Integration Tests Code Coverage'])
}
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 {
catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
junit testResults: 'cypress-results/**/*.xml', allowEmptyResults: true
}
sh script: "docker stop $BUILD_TAG-plone", returnStatus: true
sh script: "docker rm -v $BUILD_TAG-plone", returnStatus: true
sh script: "docker rm -v $BUILD_TAG-cypress", returnStatus: true
// "Cypress": {
// node(label: 'docker') {
// 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 eeacms/volto-project-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" eeacms/volto-project-ci'''
// } finally {
// try {
// sh '''rm -rf cypress-reports cypress-results cypress-coverage'''
// sh '''mkdir -p cypress-reports cypress-results cypress-coverage'''
// sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/cypress/videos cypress-reports/'''
// sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/cypress/reports cypress-results/'''
// coverage = sh script: '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/coverage cypress-coverage/''', returnStatus: true
// if ( coverage == 0 ) {
// publishHTML (target : [allowMissing: false,
// alwaysLinkToLastBuild: true,
// keepAll: true,
// reportDir: 'cypress-coverage/coverage/lcov-report',
// reportFiles: 'index.html',
// reportName: 'CypressCoverage',
// reportTitles: 'Integration Tests Code Coverage'])
// }
// 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 {
// catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
// junit testResults: 'cypress-results/**/*.xml', allowEmptyResults: true
// }
// sh script: "docker stop $BUILD_TAG-plone", returnStatus: true
// sh script: "docker rm -v $BUILD_TAG-plone", returnStatus: true
// sh script: "docker rm -v $BUILD_TAG-cypress", returnStatus: true

}
}
}
}
}
// }
// }
// }
// }
// }

)
}
}
// )
// }
// }

stage('Pull Request') {
when {
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,12 @@
"@eeacms/volto-eea-design-system": "1.0.0-beta.2"
},
"dependencies": {
"@eeacms/volto-climate-advisory-board-policy": "0.1.4",
"@eeacms/volto-climate-advisory-board-policy": "0.1.5",
"@eeacms/volto-eea-design-system": "1.0.2",
"@eeacms/volto-eea-kitkat": "13.0.0",
"@eeacms/volto-eea-website-theme": "1.11.2",
"@eeacms/volto-europa-analytics": "0.1.1",
"@eeacms/volto-newsletter-block": "0.1.1",
"@eeacms/volto-newsletter-block": "0.1.2",
"@eeacms/volto-nextcloud-video-block": "0.3.0",
"@plone/volto": "16.8.1"
},
Expand Down
Loading

0 comments on commit 0eb622a

Please sign in to comment.