Skip to content

Commit a35f36b

Browse files
committed
Skip 'setupPorts' tasks when Docker is unavailable (elastic#52679)
1 parent 4a9aa95 commit a35f36b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

x-pack/qa/oidc-op-tests/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ testFixtures.useFixture ":x-pack:test:idp-fixture", "oidc-provider"
1515
String ephemeralPort;
1616
task setupPorts {
1717
// Don't attempt to get ephemeral ports when Docker is not available
18-
onlyIf { idpFixtureProject.postProcessFixture.enabled }
18+
onlyIf { idpFixtureProject.postProcessFixture.state.skipped == false }
1919
dependsOn idpFixtureProject.postProcessFixture
2020
doLast {
2121
ephemeralPort = idpFixtureProject.postProcessFixture.ext."test.fixtures.oidc-provider.tcp.8080"

x-pack/qa/saml-idp-tests/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ project.sourceSets.test.output.dir(outputDir, builtBy: copyIdpFiles)
2222
task setupPorts {
2323
dependsOn copyIdpFiles, idpFixtureProject.postProcessFixture
2424
// Don't attempt to get ephemeral ports when Docker is not available
25-
onlyIf { idpFixtureProject.postProcessFixture.enabled }
25+
onlyIf { idpFixtureProject.postProcessFixture.state.skipped == false }
2626
doLast {
2727
String portString = idpFixtureProject.postProcessFixture.ext."test.fixtures.shibboleth-idp.tcp.4443"
2828
int ephemeralPort = Integer.valueOf(portString)

0 commit comments

Comments
 (0)