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

Use TestFixturesPlugin to Run Minio in Tests (#37852) #38973

Merged
merged 8 commits into from Mar 11, 2019
Merged

Use TestFixturesPlugin to Run Minio in Tests (#37852) #38973

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6fb6847
Use TestFixturesPlugin to Run Minio in Tests (#37852)
original-brownbear Jan 25, 2019
4c5d46e
Merge remote-tracking branch 'upstream/6.6' into backport-37852
talevy Feb 19, 2019
501293a
Fix S3 Repository ITs When Docker is not Available (#37878)
original-brownbear Jan 25, 2019
2c6ce67
Merge remote-tracking branch 'upstream/6.6' into backport-37852
talevy Feb 19, 2019
355c809
Merge remote-tracking branch 'upstream/6.6' into backport-37852
talevy Mar 7, 2019
e999046
add explicit composeUp dependsOn
talevy Mar 7, 2019
d920a7a
reverse roles
talevy Mar 8, 2019
c8c322a
reversereverse
talevy Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions plugins/repository-s3/build.gradle
View file
Open in desktop
Expand Up @@ -167,6 +167,7 @@ if (useFixture) {
}
}

preProcessFixture.dependsOn(composeUp)
talevy marked this conversation as resolved.
Show resolved Hide resolved
preProcessFixture.dependsOn(writeDockerFile)
Copy link
Member

Choose a reason for hiding this comment

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

@atorok you may be able to help here better than me :) Is there anything different about this task in 6.6 maybe that would prevent this way of triggering the docker file write from working? It seems this task isn't executed before composeUp and thus composeUp fails.

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't usually back port build changes this far so I'm fairly sure there's some change to the plugin missing in this branch.

Copy link
Member

Choose a reason for hiding this comment

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

Ah yea that makes sense, I guess we could just make composeUp depend on writeDockerFile as a workaround in 6.6?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@original-brownbear is that not what this says here https://github.com/elastic/elasticsearch/blob/v6.6/buildSrc/src/main/java/org/elasticsearch/gradle/testfixtures/TestFixturesPlugin.java#L88?

Copy link
Member

Choose a reason for hiding this comment

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

@talevy ah sorry missed your ping. Yea but I remember there was some weirdness around this actually happening before fixes by Alpar => let's try triggering on composeUp :)

// The following closure must execute before the afterEvaluate block in the constructor of the following integrationTest tasks:
project.afterEvaluate {
Expand Down