Skip to content
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.

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

Disable integTest when Docker is not available #40585

Merged
merged 2 commits into from
Mar 28, 2019

Conversation

jkakavas
Copy link
Member

@jkakavas jkakavas commented Mar 28, 2019

Resolves: #40549
Depends on: #40297

@jkakavas jkakavas added >test Issues or PRs that are addressing/adding tests :Delivery/Build Build or test infrastructure v7.0.0 v8.0.0 v7.2.0 v6.7.1 labels Mar 28, 2019
@jkakavas jkakavas requested a review from alpar-t March 28, 2019 11:07
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra

@@ -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

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
Member Author

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

Copy link
Contributor

@alpar-t alpar-t left a comment

Choose a reason for hiding this comment

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

LGTM

@jkakavas jkakavas merged commit f732a04 into elastic:master Mar 28, 2019
@jaymode
Copy link
Member

jaymode commented Mar 28, 2019

thanks for fixing this @jkakavas

jasontedor added a commit to rjernst/elasticsearch that referenced this pull request Mar 28, 2019
* master: (25 commits)
  [DOCS] Correct keystore commands for Email and Jira actions in Watcher (elastic#40417)
  [DOCS] Document common settings for snapshot repository plugins (elastic#40475)
  Remove with(out)-system-key tests (elastic#40547)
  Geo Point parse error fix (elastic#40447)
  Handle null retention leases in WaitForNoFollowersStep (elastic#40477)
  [DOCS] Adds anchors for ruby client (elastic#39867)
  Mute DataFrameAuditorIT#testAuditorWritesAudits
  Disable integTest when Docker is not available (elastic#40585)
  Add randomScore function in script_score query (elastic#40186)
  Test fixtures krb5 (elastic#40297)
  Correct ILM metadata minimum compatibility version (elastic#40569)
  SQL: Centralize SQL test dependencies version handling (elastic#40551)
  Mute testTracerLog
  Mute testHttpInput
  Include functions' aliases in the list of functions (elastic#40584)
  Optimise rejection of out-of-range `long` values (elastic#40325)
  Add docs for cluster.remote.*.proxy setting (elastic#40281)
  Migrate systemd packaging tests from bats to java (elastic#39954)
  Move top-level pipeline aggs out of QuerySearchResult (elastic#40319)
  Use openjdk 12 in packer cache script (elastic#40498)
  ...
jkakavas added a commit that referenced this pull request Mar 29, 2019
* Disable integTest when Docker is not available

Resolves: #40549
jkakavas added a commit that referenced this pull request Mar 29, 2019
* Disable integTest when Docker is not available

Resolves: #40549
jkakavas added a commit that referenced this pull request Mar 29, 2019
* Disable integTest when Docker is not available

Resolves: #40549
@jkakavas jkakavas deleted the integtest-docker branch March 29, 2019 14:22
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Mar 29, 2019
* elastic/7.0: (50 commits)
  Fix more broken links in plugins docs
  Fix archives links in plugins docs
  Disable integTest when Docker is not available (elastic#40585)
  Add docs for bundled jdk (elastic#40487)
  [DOCS] Correct keystore commands for Email and Jira actions in Watcher (elastic#40417) (elastic#40613)
  Add usage indicators for the bundled JDK (elastic#40616)
  Add ability to mute and mute flaky fixture (elastic#40630)
  Test fixtures krb5 (elastic#40297)
  Update docs for the DFR similarity (elastic#40579)
  Update ingest jdocs that a null return value will drop the current document. (elastic#40359)
  [DOCS] Document common settings for snapshot repository plugins (elastic#40475) (elastic#40607)
  [DOCS] Fixes formatting in breaking changes
  Handle null retention leases in WaitForNoFollowersStep (elastic#40477)
  Correct ILM metadata minimum compatibility version (elastic#40569)
  Mute SpecificMasterNodesIT.testElectOnlyBetweenMasterNodes()
  Mute testHttpInput
  Include functions' aliases in the list of functions (elastic#40584)
  Optimise rejection of out-of-range `long` values (elastic#40325)
  Add docs for cluster.remote.*.proxy setting (elastic#40281)
  Mute WatchAckTests.testAckAllActions
  ...
@mark-vieira mark-vieira added the Team:Delivery Meta label for Delivery team label Nov 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team >test Issues or PRs that are addressing/adding tests v6.7.1 v7.0.0-rc2 v7.2.0 v8.0.0-alpha1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Gradle build task failure for :x-pack:qa:saml-idp-tests:setupPorts
6 participants