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.

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

Jump to bottom

Run some REST tests against a cluster running in docker containers #39515

Merged
merged 20 commits into from
Jul 11, 2019
Merged

Run some REST tests against a cluster running in docker containers #39515

merged 20 commits into from
Jul 11, 2019

Conversation

alpar-t
Copy link
Contributor

@alpar-t alpar-t commented Feb 28, 2019 •
edited
Loading

Extend the test fixtures based setup to match our testing requirement, copy and execute the rest tests against it.

Note to self: this will require a change in CI to run the oss distro tests.

Closes to #38053

@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra

@javanna javanna removed their request for review March 1, 2019 08:16
@mark-vieira
Copy link
Contributor

@atorok looks like there's still some work going on here. Should this be marked WIP?

@alpar-t
Copy link
Contributor Author

alpar-t commented Mar 4, 2019

@mark-vieira there are a few tests blacklisted for failures that we still need to look at, so there's still work left, but the PR could go in, we would still get significantly more testing and can sort out those last failures lather.

@alpar-t
Copy link
Contributor Author

alpar-t commented Mar 5, 2019

#39569 should fix some of the failures muted here, but I don't think it will do so with all of them.

@alpar-t alpar-t mentioned this pull request Mar 5, 2019
Merged
mark-vieira
mark-vieira requested changes Mar 6, 2019
View reviewed changes
buildSrc/src/main/java/org/elasticsearch/gradle/testfixtures/TestFixturesPlugin.java Outdated Show resolved Hide resolved
distribution/docker/build.gradle Outdated Show resolved Hide resolved
distribution/docker/build.gradle Outdated Show resolved Hide resolved
distribution/docker/build.gradle Outdated Show resolved Hide resolved
distribution/docker/build.gradle Outdated Show resolved Hide resolved
distribution/docker/build.gradle Outdated
restSpec "org.elasticsearch:rest-api-spec:${version}"
}

task copyRestTests(type: Sync) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Rather than define a new task here, we should just configure the existing processTestResources task to do this. Its job is already to copy stuff into the resources output directory and can be configured like any other CopySpec.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I specifically wanted to have a Sync task to make sure that there are no tests accidentally left in the resources directory when switching branches etc.

Copy link
Contributor

Choose a reason for hiding this comment

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

The ProcessResources task already does this.

https://github.com/gradle/gradle/blob/master/subprojects/language-jvm/src/main/java/org/gradle/language/jvm/tasks/ProcessResources.java#L30

distribution/docker/build.gradle Outdated Show resolved Hide resolved
distribution/docker/docker-test-entrypoint.sh Outdated Show resolved Hide resolved
test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java Show resolved Hide resolved
@alpar-t
Copy link
Contributor Author

alpar-t commented Mar 6, 2019

thanks for the review @mark-vieira ! Ready for another round.

@colings86 colings86 added v6.7.2 and removed v6.7.1 labels Mar 30, 2019
@alpar-t
Copy link
Contributor Author

alpar-t commented Apr 4, 2019

@rjernst ready for another review

@polyfractal polyfractal removed the v7.0.0 label Apr 9, 2019
@colings86 colings86 added v6.7.3 and removed v6.7.2 labels Apr 17, 2019
@jakelandis jakelandis added v6.8.0 and removed v6.7.3 labels May 3, 2019
@jakelandis jakelandis added v6.8.1 and removed v6.8.0 labels May 19, 2019
@jpountz jpountz added v7.4.0 and removed v7.3.0 labels Jul 3, 2019
@alpar-t alpar-t merged commit 5310dbf into elastic:master Jul 11, 2019
@alpar-t alpar-t removed the v6.8.2 label Jul 11, 2019
@alpar-t alpar-t deleted the docker-rest-test-38053 branch July 11, 2019 12:19
alpar-t added a commit that referenced this pull request Jul 11, 2019
@alpar-t
Run some REST tests against a cluster running in docker containers (#…
7ba1873 
…39515)

* Run REST tests against a cluster running on docker

Closes #38053
@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
Reviewers

@rjernst rjernst rjernst approved these changes

@mark-vieira mark-vieira mark-vieira approved these changes

@jasontedor jasontedor Awaiting requested review from jasontedor

Assignees
No one assigned
Labels
:Delivery/Build Build or test infrastructure >non-issue Team:Delivery Meta label for Delivery team v7.4.0 v8.0.0-alpha1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@alpar-t @elasticmachine @mark-vieira @rjernst @colings86 @jpountz @jakelandis @polyfractal @danielmitterdorfer