Skip to content

Ensure we verify versioned dir for es bwc builds #66590

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

Merged
merged 4 commits into from
Dec 21, 2020

Conversation

breskeby
Copy link
Contributor

@breskeby breskeby commented Dec 18, 2020

@breskeby breskeby self-assigned this Dec 18, 2020
@breskeby breskeby added :Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team v7.11.1 v8.0.0 labels Dec 18, 2020
@breskeby breskeby marked this pull request as ready for review December 18, 2020 12:53
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-delivery (Team:Delivery)

@breskeby breskeby force-pushed the check-bwc-build-versioned-dir branch from ca73eec to dee3e0a Compare December 18, 2020 17:31
@@ -279,7 +279,9 @@ static void createBuildBwcTask(
+ "."
+ extension
),
expandedDistDirSupport ? new File(checkoutDir, baseDir + "/" + name + "/build/install/") : null
expandedDistDirSupport
? new File(checkoutDir, baseDir + "/" + name + "/build/install/elasticsearch-" + version + "-SNAPSHOT")
Copy link
Contributor

Choose a reason for hiding this comment

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

We need to include the distribution type in the path as well (i.e. -oss for the OSS distro). That's what's causing these errors:

Caused by: java.nio.file.NoSuchFileException: /dev/shm/elastic+elasticsearch+pull-request-bwc/distribution/bwc/minor/build/bwc/checkout-7.x/distribution/archives/oss-linux-tar/build/install/elasticsearch-7.12.0-SNAPSHOT/plugins/config

Copy link
Contributor

Choose a reason for hiding this comment

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

And posibly architecture too? Essentially, we need to use the same logic for building that dir name as we do for the file name as I "think" we add all those qualifiers there as well.

Copy link
Contributor Author

@breskeby breskeby Dec 18, 2020

Choose a reason for hiding this comment

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

I fixed the issue with the file not found above. The problem was not with the folder name but with the right declaration of the target install root which is still "build/install". The distro base folder name doesn't contain oss or anything arch specific as far as I see.

@breskeby breskeby merged commit d0c7c65 into elastic:master Dec 21, 2020
@breskeby breskeby deleted the check-bwc-build-versioned-dir branch December 21, 2020 08:05
breskeby added a commit to breskeby/elasticsearch that referenced this pull request Dec 21, 2020
breskeby added a commit to breskeby/elasticsearch that referenced this pull request Dec 21, 2020
breskeby added a commit that referenced this pull request Dec 21, 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 v7.11.1 v8.0.0-alpha1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants