Skip to content

Commit

Permalink
Merge pull request #141 from eea/develop
Browse files Browse the repository at this point in the history 
Release 20.1.0
  • Loading branch information
@avoinea
avoinea authored Nov 27, 2023
2 parents 765a4c5 + 683a327 commit ea60e49
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 54 deletions.
47 changes: 15 additions & 32 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,24 @@ 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).

### [20.0.2](https://github.com/eea/volto-eea-kitkat/compare/20.0.1...20.0.2) - 13 November 2023
### [20.1.0](https://github.com/eea/volto-eea-kitkat/compare/20.0.2...20.1.0) - 27 November 2023

#### :rocket: Dependency updates

- Release @eeacms/volto-metadata-block@6.0.4 [EEA Jenkins - [`f417128`](https://github.com/eea/volto-eea-kitkat/commit/f417128d7f2579e6b5f51141564e6e135c677581)]
- Release @eeacms/volto-widget-temporal-coverage@5.2.0 [EEA Jenkins - [`35dcf81`](https://github.com/eea/volto-eea-kitkat/commit/35dcf819f2e3dbed934b79f7944b8e97e613c6e1)]
- Release @eeacms/volto-hero-block@5.4.6 [EEA Jenkins - [`74482e1`](https://github.com/eea/volto-eea-kitkat/commit/74482e15954517cea4de8535f51686eaf1d3328d)]
- Release @eeacms/volto-group-block@6.3.5 [EEA Jenkins - [`a0d490e`](https://github.com/eea/volto-eea-kitkat/commit/a0d490e2554dbb84088f46c15fe041324202cbf0)]
- Release @eeacms/volto-listing-block@6.2.0 [EEA Jenkins - [`7b1df8e`](https://github.com/eea/volto-eea-kitkat/commit/7b1df8e4f227d5aeb99a4eb79dac2c1e0a02da10)]
- Release @eeacms/volto-tabs-block@7.0.2 [EEA Jenkins - [`5b2f125`](https://github.com/eea/volto-eea-kitkat/commit/5b2f125790f921fd468a354c71ff29a1e80a846e)]
- Release @eeacms/volto-metadata-block@6.0.5 [EEA Jenkins - [`05735c1`](https://github.com/eea/volto-eea-kitkat/commit/05735c1d8574c4ffb873f314bf7cc0a4dbcbc391)]
- Release @eeacms/volto-accordion-block@10.4.4 [EEA Jenkins - [`b97a0c7`](https://github.com/eea/volto-eea-kitkat/commit/b97a0c7537cd2dee0f754f2dce258939a893f34d)]
- Release @eeacms/volto-columns-block@7.0.0 [EEA Jenkins - [`009c44b`](https://github.com/eea/volto-eea-kitkat/commit/009c44bce179056fdbbd51f8349f2d7dd0adcdbb)]
- Release @eeacms/volto-listing-block@6.1.0 [EEA Jenkins - [`0fb8570`](https://github.com/eea/volto-eea-kitkat/commit/0fb8570d335b712b89c21df3646891873be34036)]

#### :hammer_and_wrench: Others

- Release 20.1.0 [Alin Voinea - [`eabf7e2`](https://github.com/eea/volto-eea-kitkat/commit/eabf7e21a2f6740d139cec29117b6c0d3dcf123d)]
### [20.0.2](https://github.com/eea/volto-eea-kitkat/compare/20.0.1...20.0.2) - 15 November 2023

### [20.0.1](https://github.com/eea/volto-eea-kitkat/compare/20.0.0...20.0.1) - 13 November 2023

Expand All @@ -19,11 +32,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`f9c872b`](https://github.com/eea/volto-eea-kitkat/commit/f9c872b27eca12147b8d2728c24fbc37a6132f6a)]
- test: [JENKINS] set cpu limit on cypress [valentinab25 - [`bcdc347`](https://github.com/eea/volto-eea-kitkat/commit/bcdc34701e1fea38af7d5b580a0831a864c18a3b)]
- test: [JENKINS] add shm-size to cypress docker [valentinab25 - [`cfb36e2`](https://github.com/eea/volto-eea-kitkat/commit/cfb36e29aa419a1f7c24d38ca4316c99c8d7f4df)]
- test: [JENKINS] improve cypress time [valentinab25 - [`0df1585`](https://github.com/eea/volto-eea-kitkat/commit/0df15850745f388937152a104128b4c3a586701f)]
- test: [JENKINS] improve cypress time [valentinab25 - [`6b9a750`](https://github.com/eea/volto-eea-kitkat/commit/6b9a750d8d1676dbbe418021643dc0ea145dd6d2)]
## [20.0.0](https://github.com/eea/volto-eea-kitkat/compare/19.1.0...20.0.0) - 2 November 2023

#### :rocket: Dependency updates
Expand Down Expand Up @@ -60,7 +68,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :house: Internal changes

- chore: [JENKINS] Refactor automated testing [valentinab25 - [`068610e`](https://github.com/eea/volto-eea-kitkat/commit/068610e11366f3d9a2c49c7ed1b22c0ae4549b5d)]

#### :hammer_and_wrench: Others

Expand Down Expand Up @@ -399,7 +406,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :house: Internal changes

- chore: Revert version bump until ready for release [Alin Voinea - [`91ada51`](https://github.com/eea/volto-eea-kitkat/commit/91ada510d1f78cee615c9ffdf9307995f2b1722d)]
- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`a62f4ff`](https://github.com/eea/volto-eea-kitkat/commit/a62f4ffee3796fa3558628fe1d63a9a263ae6bd2)]

#### :hammer_and_wrench: Others

Expand Down Expand Up @@ -516,7 +522,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 - [`8ec6014`](https://github.com/eea/volto-eea-kitkat/commit/8ec6014398b1b266b4f0173b92539245a385ee1a)]
- refactor code as per sonarqube issues [tedw87 - [`6aab22a`](https://github.com/eea/volto-eea-kitkat/commit/6aab22a3ddf038bdce2272be8733b9afd9562720)]
## [14.0.0](https://github.com/eea/volto-eea-kitkat/compare/13.0.0...14.0.0) - 24 March 2023

Expand Down Expand Up @@ -550,7 +555,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

- Release 12.1.0 [Alin Voinea - [`f98ddf7`](https://github.com/eea/volto-eea-kitkat/commit/f98ddf78b0818591f95e027d612257f78fcbba99)]
- test(Jenkins): Use latest stable Volto for testing [Alin Voinea - [`49938ca`](https://github.com/eea/volto-eea-kitkat/commit/49938ca373ee9f6384932fa39b957361db3b84a7)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`877d026`](https://github.com/eea/volto-eea-kitkat/commit/877d026f7a98bed9aac7f0117cace1e28963ccf1)]
### [12.0.3](https://github.com/eea/volto-eea-kitkat/compare/12.0.2...12.0.3) - 1 March 2023

### [12.0.2](https://github.com/eea/volto-eea-kitkat/compare/12.0.1...12.0.2) - 1 March 2023
Expand Down Expand Up @@ -645,7 +649,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`78dcc6c`](https://github.com/eea/volto-eea-kitkat/commit/78dcc6c91c3070988f8eab4f40906948b2f24b04)]
### [10.4.0](https://github.com/eea/volto-eea-kitkat/compare/10.3.0...10.4.0) - 28 December 2022

#### :rocket: Dependency updates
Expand All @@ -658,7 +661,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- Release 10.4.0 [Alin Voinea - [`9f580b7`](https://github.com/eea/volto-eea-kitkat/commit/9f580b75c7349f824bf537a9f14c2da1c505a105)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`fd9cc58`](https://github.com/eea/volto-eea-kitkat/commit/fd9cc589f17e2eb73bf42f88645688824f97eb9e)]
### [10.3.0](https://github.com/eea/volto-eea-kitkat/compare/10.2.0...10.3.0) - 16 December 2022

#### :rocket: Dependency updates
Expand All @@ -670,7 +672,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- Release 10.3.0 [Alin Voinea - [`4f9945a`](https://github.com/eea/volto-eea-kitkat/commit/4f9945a0fd1a981a7f4b43c56293040dba0dd09d)]
- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`92644a9`](https://github.com/eea/volto-eea-kitkat/commit/92644a95981feb5fc97931d549a078d5bb190839)]
### [10.2.0](https://github.com/eea/volto-eea-kitkat/compare/10.1.1...10.2.0) - 29 November 2022

#### :rocket: Dependency updates
Expand Down Expand Up @@ -701,7 +702,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

- Fix storybook [Alin Voinea - [`79d961a`](https://github.com/eea/volto-eea-kitkat/commit/79d961a12cf1e90871a0aa840a86852f343db4ac)]
- Release 10.1.0 [Alin Voinea - [`574c998`](https://github.com/eea/volto-eea-kitkat/commit/574c998265f65f41190d60e50a9c90e0d818be35)]
- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`c53b32f`](https://github.com/eea/volto-eea-kitkat/commit/c53b32fe433942500365fc7384c36db46eb9e87e)]
## [10.0.0](https://github.com/eea/volto-eea-kitkat/compare/9.0.0...10.0.0) - 16 November 2022

#### :rocket: New Features
Expand Down Expand Up @@ -812,7 +812,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`fdeeab3`](https://github.com/eea/volto-eea-kitkat/commit/fdeeab3e19db1a57e69dab8513d37323c0d16e11)]
### [8.2.2](https://github.com/eea/volto-eea-kitkat/compare/8.2.1...8.2.2) - 28 September 2022

### [8.2.1](https://github.com/eea/volto-eea-kitkat/compare/8.2.0...8.2.1) - 28 September 2022
Expand All @@ -830,7 +829,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- Release 8.2.0 [Alin Voinea - [`0e39600`](https://github.com/eea/volto-eea-kitkat/commit/0e39600048be15512a9ec742830f1412beb6db4f)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`b88dbd1`](https://github.com/eea/volto-eea-kitkat/commit/b88dbd11c7dc85a57b22b98a7a71c33bb827cd34)]
### [8.1.0](https://github.com/eea/volto-eea-kitkat/compare/8.0.0...8.1.0) - 22 September 2022

#### :rocket: Dependency updates
Expand Down Expand Up @@ -862,12 +860,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- Merge pull request #66 from eea/develop [Nilesh - [`f7d1d2f`](https://github.com/eea/volto-eea-kitkat/commit/f7d1d2f0e209a6650d134a7657ded482bc87b3d5)]
- [jenkins] fix coverage report name [valentinab25 - [`d3d29e4`](https://github.com/eea/volto-eea-kitkat/commit/d3d29e49bb323f82d1ef2d2d9e8674c8c9455386)]
### [7.1.1](https://github.com/eea/volto-eea-kitkat/compare/7.1.0...7.1.1) - 5 September 2022

#### :hammer_and_wrench: Others

- [jenkins] fix coverage report name [valentinab25 - [`b03633d`](https://github.com/eea/volto-eea-kitkat/commit/b03633d92c50ae921cf902b88d6321d347aac3d2)]
### [7.1.0](https://github.com/eea/volto-eea-kitkat/compare/7.0.0...7.1.0) - 29 August 2022

## [7.0.0](https://github.com/eea/volto-eea-kitkat/compare/6.2.3...7.0.0) - 26 August 2022
Expand Down Expand Up @@ -940,7 +936,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`88e838b`](https://github.com/eea/volto-eea-kitkat/commit/88e838bdf224f8f30a48822dc0b457f3eba8c837)]
- update volto-widget-dataprovenance readme badges [Nilesh - [`5009c47`](https://github.com/eea/volto-eea-kitkat/commit/5009c47097c70ba102e41cba2870d6aad37221d3)]
- Revert "Trying to fix cypress" [Alin Voinea - [`0c1eeb2`](https://github.com/eea/volto-eea-kitkat/commit/0c1eeb2fada6e204fed19140407f642ffde5e07f)]
- Trying to fix cypress [Alin Voinea - [`61c3a51`](https://github.com/eea/volto-eea-kitkat/commit/61c3a5105608e3015c59c5d74e5d2afcc86f434f)]
Expand Down Expand Up @@ -1063,7 +1058,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`23f80c1`](https://github.com/eea/volto-eea-kitkat/commit/23f80c1a3d3fd77ad8be5fdf6ef3354d61ef2849)]
- Update README.md [Alexandru Ghica - [`69f379b`](https://github.com/eea/volto-eea-kitkat/commit/69f379bb4effb22be2e78eda6599c822202acfd3)]
### [5.2.6](https://github.com/eea/volto-eea-kitkat/compare/5.2.5...5.2.6) - 16 March 2022

Expand All @@ -1082,7 +1076,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 - [`340e29a`](https://github.com/eea/volto-eea-kitkat/commit/340e29aba1802068591da23490562db0dd6a9a01)]
### [5.2.4](https://github.com/eea/volto-eea-kitkat/compare/5.2.3...5.2.4) - 4 March 2022

### [5.2.3](https://github.com/eea/volto-eea-kitkat/compare/5.2.2...5.2.3) - 4 March 2022
Expand Down Expand Up @@ -1248,7 +1241,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`106efb6`](https://github.com/eea/volto-eea-kitkat/commit/106efb623afd9142b4d3cea2225f7b197608a5b6)]
- Add SonarQube badges [Alin Voinea - [`c9ab6ef`](https://github.com/eea/volto-eea-kitkat/commit/c9ab6efe9c303775751856ffec72923169a7c2ac)]
### [4.1.7](https://github.com/eea/volto-eea-kitkat/compare/4.1.6...4.1.7) - 24 November 2021

Expand Down Expand Up @@ -1302,7 +1294,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Disable cypress [Alin Voinea - [`a406e2d`](https://github.com/eea/volto-eea-kitkat/commit/a406e2dc4be788f924642d43d82c677577a6877a)]
- Roll-back volto-slate to 4.2.1 [Alin Voinea - [`ab6ae97`](https://github.com/eea/volto-eea-kitkat/commit/ab6ae97366c1b75b73d77636f5ab937401b9f8f7)]
- Add dependencies resolutions [Alin Voinea - [`7ade630`](https://github.com/eea/volto-eea-kitkat/commit/7ade6305c9c9dfc5c2e332c50676d5f75ffe4c9f)]
- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`a77e812`](https://github.com/eea/volto-eea-kitkat/commit/a77e812cd7aa74bc1d94cc5a44144f05b6d99264)]
### [4.1.2](https://github.com/eea/volto-eea-kitkat/compare/4.1.1...4.1.2) - 4 November 2021

#### :rocket: Dependency updates
Expand All @@ -1320,9 +1311,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Release volto-slate 4.2.1 [Alin Voinea - [`3c26754`](https://github.com/eea/volto-eea-kitkat/commit/3c26754a1ead420dfb675c7453cec6d723566a85)]
- Release stable volto-slate 4.2.0 [Alin Voinea - [`591bcba`](https://github.com/eea/volto-eea-kitkat/commit/591bcbafa174a6cf20f45b622b2c1407df24c288)]
- Revert "Release [email protected]" [Alin Voinea - [`6c22eb3`](https://github.com/eea/volto-eea-kitkat/commit/6c22eb35c65f8ee7470f6dac18fe88ad73bdef3e)]
- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`981c570`](https://github.com/eea/volto-eea-kitkat/commit/981c570138a1b0890080a111b862759049216995)]
- Revert "[JENKINS] - skip cypress" [Alin Voinea - [`c24997c`](https://github.com/eea/volto-eea-kitkat/commit/c24997cd7a293c4021ac7a8bc43212bae4cfecbc)]
- Revert "[JENKINS] - Skip cypress report to sonar" [Alin Voinea - [`0cb9887`](https://github.com/eea/volto-eea-kitkat/commit/0cb9887381e5469466bb1ac3516af0d1d572fc19)]
### [4.1.0](https://github.com/eea/volto-eea-kitkat/compare/4.0.2...4.1.0) - 14 October 2021

#### :rocket: Dependency updates
Expand Down Expand Up @@ -1352,7 +1340,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`e3f00fb`](https://github.com/eea/volto-eea-kitkat/commit/e3f00fb23202e8ba20c8dbb961a3f54f86b42bb9)]
- Add cypress integration tests [Alin Voinea - [`b49a070`](https://github.com/eea/volto-eea-kitkat/commit/b49a070bdbe2dcd04a31f96ade6d6f06fea94e7b)]
## [4.0.0](https://github.com/eea/volto-eea-kitkat/compare/3.0.2...4.0.0) - 29 September 2021

Expand All @@ -1365,10 +1352,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

- Rename volto-satging-banner to volto-banner 1.0.0 [Alin Voinea - [`eefc06b`](https://github.com/eea/volto-eea-kitkat/commit/eefc06b186efef1a9627bde3e65656d7be074de6)]
- Add staging-banner to Readme [Alin Voinea - [`cbca78f`](https://github.com/eea/volto-eea-kitkat/commit/cbca78f9b4f76c57dbecd131452925fe7fbe24b4)]
- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`485a0ba`](https://github.com/eea/volto-eea-kitkat/commit/485a0ba3c16521eba77b092fbae04671acbd3a4d)]
- Revert "Automated release [email protected]" [Alin Voinea - [`447abb0`](https://github.com/eea/volto-eea-kitkat/commit/447abb0791616463d5c7fa4ee562ddd1c7984275)]
- Remove not needed tableButton volto-slate profile [Alin Voinea - [`f8a832e`](https://github.com/eea/volto-eea-kitkat/commit/f8a832ed5702ef656c520b842307ce262a110c9b)]
- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`af37bcf`](https://github.com/eea/volto-eea-kitkat/commit/af37bcfc75a6868484665ba4710867f61cb7eb39)]
### [3.0.2](https://github.com/eea/volto-eea-kitkat/compare/3.0.1...3.0.2) - 21 September 2021

### [3.0.1](https://github.com/eea/volto-eea-kitkat/compare/3.0.0...3.0.1) - 21 September 2021
Expand All @@ -1381,7 +1366,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- Update to version 3.0.0 [Alexandru Ghica - [`89bd9fd`](https://github.com/eea/volto-eea-kitkat/commit/89bd9fde1a8e4949f849bf8208cff33df1995a8d)]
- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`b700b5a`](https://github.com/eea/volto-eea-kitkat/commit/b700b5a985714197e89e656927586367d63b90a7)]
### [2.0.2](https://github.com/eea/volto-eea-kitkat/compare/2.0.1...2.0.2) - 10 September 2021

#### :hammer_and_wrench: Others
Expand Down Expand Up @@ -1413,5 +1397,4 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- yarn bootstrap [Alin Voinea - [`180a877`](https://github.com/eea/volto-eea-kitkat/commit/180a877a89301183ce7492933965161e21e2509b)]
- Initial commit [Alin Voinea - [`0451abf`](https://github.com/eea/volto-eea-kitkat/commit/0451abfbaad75a437b9e6ec0df56b924c8d1637f)]
10 changes: 9 additions & 1 deletion Jenkinsfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
pipeline {
tools {
jdk 'Java17'
}
agent {
node { label 'docker-host' }
}
Expand Down Expand Up @@ -159,7 +162,8 @@ pipeline {
script {
try {
sh '''docker run --pull always --rm -d --name="$IMAGE_NAME-plone" -e SITE="Plone" -e PROFILES="$BACKEND_PROFILES" -e ADDONS="$BACKEND_ADDONS" eeacms/plone-backend'''
sh '''timeout -s 9 3600 docker run --shm-size=2g --cpu-quota=150000 --link $IMAGE_NAME-plone:plone --entrypoint=make --name="$IMAGE_NAME-cypress" --workdir=/app/src/addons/${GIT_NAME} -e "RAZZLE_INTERNAL_API_PATH=http://plone:8080/Plone" $IMAGE_NAME-frontend cypress-ci'''
sh '''docker run -d --shm-size=3g --link $IMAGE_NAME-plone:plone --name="$IMAGE_NAME-cypress" -e "RAZZLE_INTERNAL_API_PATH=http://plone:8080/Plone" --entrypoint=make --workdir=/app/src/addons/$GIT_NAME $IMAGE_NAME-frontend start-ci'''
sh '''timeout -s 9 1800 docker exec --workdir=/app/src/addons/${GIT_NAME} $IMAGE_NAME-cypress make cypress-ci'''
} finally {
try {
sh '''rm -rf cypress-videos cypress-results cypress-coverage cypress-screenshots'''
Expand Down Expand Up @@ -189,6 +193,10 @@ pipeline {
catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
junit testResults: 'cypress-results/**/*.xml', allowEmptyResults: true
}
catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
sh '''docker logs $IMAGE_NAME-cypress'''
}
sh script: "docker stop $IMAGE_NAME-cypress", returnStatus: true
sh script: "docker stop $IMAGE_NAME-plone", returnStatus: true
sh script: "docker rm -v $IMAGE_NAME-plone", returnStatus: true
sh script: "docker rm -v $IMAGE_NAME-cypress", returnStatus: true
Expand Down
6 changes: 2 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,12 @@ test-ci:

.PHONY: start-ci
start-ci:
cp .coverage.babel.config.js /app/babel.config.js
cd ../..
yarn start &
yarn start

.PHONY: cypress-ci
cypress-ci:
cp .coverage.babel.config.js /app/babel.config.js
make start-ci
$(NODE_MODULES)/.bin/wait-on -t 240000 http://localhost:3000
NODE_ENV=development make cypress-run


Loading

0 comments on commit ea60e49

Please sign in to comment.