From 474ea393e167dfd96d3fdc5bfb3a18fa9d192269 Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Thu, 28 Mar 2019 13:05:19 +0200 Subject: [PATCH 1/2] Disable integTest when Docker is not available Resolves: #40549 --- x-pack/qa/saml-idp-tests/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x-pack/qa/saml-idp-tests/build.gradle b/x-pack/qa/saml-idp-tests/build.gradle index 44a28278636a9..6caa56ca9099c 100644 --- a/x-pack/qa/saml-idp-tests/build.gradle +++ b/x-pack/qa/saml-idp-tests/build.gradle @@ -38,6 +38,9 @@ task setupPorts { idpMetaFile.write(content.toString(), "UTF-8") } } +// Don't attempt to run integTest when Docker is not available +integTest.enabled = idpFixtureProject.postProcessFixture.enabled + integTestCluster.dependsOn setupPorts integTestCluster { From d78de08acd5a6e8769afcea557e2f066d8b85711 Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Thu, 28 Mar 2019 13:35:57 +0200 Subject: [PATCH 2/2] address feedback --- x-pack/qa/saml-idp-tests/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/qa/saml-idp-tests/build.gradle b/x-pack/qa/saml-idp-tests/build.gradle index 6caa56ca9099c..7b76321fe9d4f 100644 --- a/x-pack/qa/saml-idp-tests/build.gradle +++ b/x-pack/qa/saml-idp-tests/build.gradle @@ -38,8 +38,8 @@ task setupPorts { idpMetaFile.write(content.toString(), "UTF-8") } } -// Don't attempt to run integTest when Docker is not available -integTest.enabled = idpFixtureProject.postProcessFixture.enabled +// Don't attempt to get ephemeral ports when Docker is not available +setupPorts.onlyIf { idpFixtureProject.postProcessFixture.enabled } integTestCluster.dependsOn setupPorts