Skip to content

Commit 378abf3

Browse files
committed
Merge branch 'release/v2.1.1' into main
2 parents 2d7b335 + 610cf49 commit 378abf3

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

CHANGELOG.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9-
## [v2.1.0](https://github.com/cloudogu/zalenium-build-lib/releases/tag/v2.1.0) - 2020-12-14
9+
## [v2.1.1](https://github.com/cloudogu/zalenium-build-lib/releases/tag/v2.1.1) - 2021-03-17
10+
### Fixed
11+
- waiting for the selenium grid does not fail instantly if the grid api isn't up already (#13)
1012

13+
## [v2.1.0](https://github.com/cloudogu/zalenium-build-lib/releases/tag/v2.1.0) - 2020-12-14
1114
### Added
12-
1315
- config parameter for controlling the video recording during test execution (#11)
1416

1517
## [v2.0.0](https://github.com/cloudogu/zalenium-build-lib/releases/tag/v2.0.0) - 2020-02-21
@@ -42,7 +44,6 @@ The release v1.2.0 introduced a defect in which the default Nexus mirror reposit
4244
This release contains breaking changes and should not be used. Instead use the release v2.0.0
4345

4446
## [v1.1.0](https://github.com/cloudogu/zalenium-build-lib/releases/tag/v1.1.0) - 2019-09-18
45-
4647
### Added
4748

4849
In this release several Maven settings and truststore helpers are added. These are addressable with following jenkins pipeline variables for which (if the library is added) help texts appear in Jenkins' pipeline steps help (#4, #6):

vars/withSelenium.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void waitForSeleniumToGetReady(String host) {
107107

108108
boolean isSeleniumReady(String host) {
109109
def result = sh(returnStdout: true,
110-
script: "curl -sSL http://${host}/wd/hub/status") // Don't fail
110+
script: "curl -sSL http://${host}/wd/hub/status || true") // Don't fail
111111
result.contains('ready\": true')
112112
}
113113

0 commit comments

Comments
 (0)