Skip to content

Disable integTest when Docker is not available #40585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 28, 2019
Merged

Disable integTest when Docker is not available #40585

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
474ea39
Disable integTest when Docker is not available
jkakavas Mar 28, 2019
d78de08
address feedback
jkakavas Mar 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions x-pack/qa/saml-idp-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

@alpar-t alpar-t Mar 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With #40297 the test fixture plugin will do this automatically, but I think you're problem is with setupPorts because the plugin doesn't know about that and it will run when there's no docker and thus no ports, so I think that also needs to be disabled here.

For a more generic solution I think we need the plugin to add a postProcessFixture task on the projects that use the fixture, and properly disable it when there's no docker, so you could add a doLast to it here instead of defining a new task.

Copy link
Contributor Author

@jkakavas jkakavas Mar 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so I think that also needs to be disabled here.

Great, I didn't see that in #40297 , will change this solution


integTestCluster.dependsOn setupPorts

integTestCluster {
Expand Down