From 72a2d0f9d89851827517e56806c7d7d9f09a475d Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Sat, 22 Feb 2020 18:17:15 -0800 Subject: [PATCH] Skip 'setupPorts' tasks when Docker is unavailable (#52679) --- x-pack/qa/oidc-op-tests/build.gradle | 2 +- x-pack/qa/saml-idp-tests/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/qa/oidc-op-tests/build.gradle b/x-pack/qa/oidc-op-tests/build.gradle index 204a6a33244..86a53e54876 100644 --- a/x-pack/qa/oidc-op-tests/build.gradle +++ b/x-pack/qa/oidc-op-tests/build.gradle @@ -15,7 +15,7 @@ testFixtures.useFixture ":x-pack:test:idp-fixture", "oidc-provider" String ephemeralPort; task setupPorts { // Don't attempt to get ephemeral ports when Docker is not available - onlyIf { idpFixtureProject.postProcessFixture.enabled } + onlyIf { idpFixtureProject.postProcessFixture.state.skipped == false } dependsOn idpFixtureProject.postProcessFixture doLast { ephemeralPort = idpFixtureProject.postProcessFixture.ext."test.fixtures.oidc-provider.tcp.8080" diff --git a/x-pack/qa/saml-idp-tests/build.gradle b/x-pack/qa/saml-idp-tests/build.gradle index 51842ae398a..5d7cb84acf6 100644 --- a/x-pack/qa/saml-idp-tests/build.gradle +++ b/x-pack/qa/saml-idp-tests/build.gradle @@ -22,7 +22,7 @@ project.sourceSets.test.output.dir(outputDir, builtBy: copyIdpFiles) task setupPorts { dependsOn copyIdpFiles, idpFixtureProject.postProcessFixture // Don't attempt to get ephemeral ports when Docker is not available - onlyIf { idpFixtureProject.postProcessFixture.enabled } + onlyIf { idpFixtureProject.postProcessFixture.state.skipped == false } doLast { String portString = idpFixtureProject.postProcessFixture.ext."test.fixtures.shibboleth-idp.tcp.4443" int ephemeralPort = Integer.valueOf(portString)