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

[TEST] Use tests from corresponding ES version #649

Merged
merged 3 commits into from
Nov 7, 2017

Conversation

mhujer
Copy link
Contributor

@mhujer mhujer commented Sep 14, 2017

This changes the build so it checks out the very same version of the tests as the ES instance.

TODO:

  • Maybe change it so it does not depend on ES binary. Build hash can be fetched from running ES version.build_hash (also safer than parsing the output)
  • wait for 6.x to pass? Or we can move it to allowed failures - seems more future-proof to me
  • drop 5.5 from Travis // I'm fine with that
  • Update .github/CONTRIBUTING.md - it references TEST_BUILD_REF

It passed for ES 6.0.

@@ -26,6 +26,21 @@
echo "Update elasticsearch submodule\n";
$git->fetchAll(array('verbose' => true));

$hash = $_SERVER['TEST_BUILD_REF'];
$out = [];
exec('./elasticsearch-*/bin/elasticsearch --version', $out);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

It returns this: Version: 6.0.0-rc1-SNAPSHOT, Build: 6f57a84/2017-09-01T18:07:02.565Z, JVM: 1.8.0_144

var_dump($version);

$matches = [];
preg_match('~Version: .*, Build: (?P<hash>.*)\/.*~', $version, $matches);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this parses out the hash 6f57a84

@mhujer mhujer changed the title [TEST] Use tests from corresponding ES version. DO NOT MERGE (yet) [TEST] Use tests from corresponding ES version Sep 15, 2017
@mhujer
Copy link
Contributor Author

mhujer commented Sep 15, 2017

@polyfractal R4R (I recommend reading the commits, not the unified diff)

@mhujer
Copy link
Contributor Author

mhujer commented Sep 27, 2017

ping @polyfractal ;-)

@polyfractal
Copy link
Contributor

Heya :)

Just FYI, it's gonna be a slow month here: I'm in Toronto atm for an Elasticon tour, then doing a bunch of support next week, then vacation and finally an all-engineering meeting in Berlin. Business should return to normal end of October, although I'll try to slot in PRs when I get a chance before vacation next week.

Just wanted to let you know for when things go really quiet soon :)

@mhujer
Copy link
Contributor Author

mhujer commented Sep 27, 2017

Thanks for letting me know! Enjoy your vacation 🌴 🏖

@Artistan
Copy link
Contributor

This would help ALL of the other commits get verified I believe! :)

@polyfractal
Copy link
Contributor

I'm back from holiday + a work trip, so things should get moving again once I un-bury my inbox :)

@mhujer
Copy link
Contributor Author

mhujer commented Oct 28, 2017

I re-ran the build and it passes (against ES 6.0.0-rc1)

@polyfractal
Copy link
Contributor

Awesome, thanks @mhujer! I got roped into a last minute training last week and need to triage my inbox today, but I'm designating tomorrow as PHP client day to work on PRs/Issues

Thanks for the patience :)

@polyfractal polyfractal merged commit 411b50f into elastic:master Nov 7, 2017
@polyfractal
Copy link
Contributor

So much ❤️ :)

@mhujer mhujer deleted the mh-es-build-specific-commit branch November 7, 2017 18:14
polyfractal pushed a commit that referenced this pull request Nov 14, 2017
* [TEST] Drop ES 5.5 from TravisCI build matrix

* [TEST] run tests for exactly same version the server has

* [Travis] allow_failures on ES 6.x
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants