[test] packaging: gradle tasks for groovy tests #29046
Merged
+95
−96
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The vagrant test plugin adds tasks for the groovy packaging tests, which run after the bats packaging test tasks.Rename the 'bats' configuration to 'packaging' and remove the option to inherit archives from this configuration. For elastic#26741
andyb-elastic
added
>test
rjernst
reviewed
Mar 17, 2018
| @@ -154,20 +156,39 @@ class VagrantTestPlugin implements Plugin<Project> { | |||
| } | |||
|
|
|||
| private static void createPrepareVagrantTestEnvTask(Project project) { | |||
| File batsDir = new File("${project.buildDir}/${BATS}") | |||
| File packagingDir = new File(project.buildDir, PACKAGING_CONFIGURATION) | |||
| Task createPackagingDirTask = project.tasks.create('creatingPackagingDir') | |||
There was a problem hiding this comment.
Why do we need this task? Copy tasks will create the destination dir if it doesn't exist. Worst case, this could be a doFirst on copyPackagingArchives.
There was a problem hiding this comment.
You're right, we don't. I inferred from the createBatsDirs task that it had to already exist - I'll remove both
| groovyPackagingTest.dependsOn(up) | ||
| groovyPackagingTest.finalizedBy(halt) | ||
| groovyPackagingTest.doLast { | ||
| // no op |
There was a problem hiding this comment.
I added the empty groovyPackagingTest task to introduce changes incrementally (the next PR will make this into a VagrantCommandTask that executes the test jar)
The empty doLast with the comment is just to make it explicit that the task doesn't currently do anything
| void afterExecute(Task task, TaskState state) { | ||
| final String gradlew = Os.isFamily(Os.FAMILY_WINDOWS) ? "gradlew" : "./gradlew" | ||
| if (state.failure != null) { | ||
| println "REPRODUCE WITH: ${gradlew} ${task.path} -Dtests.seed=${project.testSeed} " |
There was a problem hiding this comment.
Using task.path only works because this listener is always be added/removed in doFirst/doLast on a task. Rather that depend on that behavior, why not pass in the task name to createReproListener?
There was a problem hiding this comment.
Gotcha - my thinking was to prevent the repro message from mistakenly having a different task than the one that triggered the listener. But since the listener is added to the project, not the task, that makes it less clear what's happening. I'll have it pass the task as a parameter
* Removes unnecessary tasks for creating packaging directories inside the gradle build directory * Take an explicit task path to be reproduced when creating reproduction listeners * Make more clear the intent behind adding the empty groovy packaging test
|
@rjernst I pushed andyb-elastic@b79c104 to address your comments |
|
Jenkins run packaging tests please |
andyb-elastic
added a commit
that referenced
this pull request
Mar 26, 2018
The vagrant test plugin adds tasks for the groovy packaging tests, which run after the bats packaging test tasks.Rename the 'bats' configuration to 'packaging' and remove the option to inherit archives from this configuration.
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Mar 27, 2018
* master: Do not optimize append-only if seen normal op with higher seqno (elastic#28787) [test] packaging: gradle tasks for groovy tests (elastic#29046) Prune only gc deletes below local checkpoint (elastic#28790)
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Mar 27, 2018
* master: (40 commits) Do not optimize append-only if seen normal op with higher seqno (elastic#28787) [test] packaging: gradle tasks for groovy tests (elastic#29046) Prune only gc deletes below local checkpoint (elastic#28790) remove testUnassignedShardAndEmptyNodesInRoutingTable elastic#28745: remove extra option in the composite rest tests Fold EngineDiskUtils into Store, for better lock semantics (elastic#29156) Add file permissions checks to precommit task Remove execute mode bit from source files Optimize the composite aggregation for match_all and range queries (elastic#28745) [Docs] Add rank_eval size parameter k (elastic#29218) [DOCS] Remove ignore_z_value parameter link Docs: Update docs/index_.asciidoc (elastic#29172) Docs: Link C++ client lib elasticlient (elastic#28949) [DOCS] Unregister repository instead of deleting it (elastic#29206) Docs: HighLevelRestClient#multiSearch (elastic#29144) Add Z value support to geo_shape Remove type casts in logging in server component (elastic#28807) Change BroadcastResponse from ToXContentFragment to ToXContentObject (elastic#28878) REST : Split `RestUpgradeAction` into two actions (elastic#29124) Add error file docs to important settings ...
martijnvg
added a commit
that referenced
this pull request
Mar 28, 2018
* es/master: (22 commits) Fix building Javadoc JARs on JDK for client JARs (#29274) Require JDK 10 to build Elasticsearch (#29174) Decouple NamedXContentRegistry from ElasticsearchException (#29253) Docs: Update generating test coverage reports (#29255) [TEST] Fix issue with HttpInfo passed invalid parameter Remove all dependencies from XContentBuilder (#29225) Fix sporadic failure in CompositeValuesCollectorQueueTests Propagate ignore_unmapped to inner_hits (#29261) TEST: Increase timeout for testPrimaryReplicaResyncFailed REST client: hosts marked dead for the first time should not be immediately retried (#29230) TEST: Use different translog dir for a new engine Make SearchStats implement Writeable (#29258) [Docs] Spelling and grammar changes to reindex.asciidoc (#29232) Do not optimize append-only if seen normal op with higher seqno (#28787) [test] packaging: gradle tasks for groovy tests (#29046) Prune only gc deletes below local checkpoint (#28790) remove testUnassignedShardAndEmptyNodesInRoutingTable #28745: remove extra option in the composite rest tests Fold EngineDiskUtils into Store, for better lock semantics (#29156) Add file permissions checks to precommit task ...
martijnvg
added a commit
that referenced
this pull request
Mar 28, 2018
* es/6.x: Fix building Javadoc JARs on JDK for client JARs (#29274) Require JDK 10 to build Elasticsearch (#29174) Decouple NamedXContentRegistry from ElasticsearchException (#29253) Docs: Update generating test coverage reports (#29255) [TEST] Fix issue with HttpInfo passed invalid parameter Remove all dependencies from XContentBuilder (#29225) Fix sporadic failure in CompositeValuesCollectorQueueTests Propagate ignore_unmapped to inner_hits (#29261) TEST: Increase timeout for testPrimaryReplicaResyncFailed REST client: hosts marked dead for the first time should not be immediately retried (#29230) Make SearchStats implement Writeable (#29258) [Docs] Spelling and grammar changes to reindex.asciidoc (#29232) [test] packaging: gradle tasks for groovy tests (#29046) remove testUnassignedShardAndEmptyNodesInRoutingTable Add file permissions checks to precommit task Remove execute mode bit from source files #28745: remove 7.x option in the composite rest tests. Optimize the composite aggregation for match_all and range queries (#28745) Clarify deprecation warning for auto_generate_phrase_query (#29204)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The vagrant test plugin adds tasks for the groovy packaging tests,
which run after the bats packaging test tasks.Rename the 'bats'
configuration to 'packaging' and remove the option to inherit
archives from this configuration.
For #26741
This originally appeared in #27623