-
Notifications
You must be signed in to change notification settings - Fork 25.5k
Fix FwC test task registration #133937
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
Fix FwC test task registration #133937
Conversation
With this change it takes into account that not all versions have previous minor unreleased version (because we are on the oldest active development branch), or that current version has minor == 0 (e.g. 9.0) so previous minor have to be calculated differently.
Pinging @elastic/es-delivery (Team:Delivery) |
systemProperty("tests.old_cluster_version", previousMinorSnapshot) | ||
systemProperty("tests.new_cluster_version", fwcVersion) | ||
nonInputProperties.systemProperty 'tests.fwc', 'true' | ||
Version elasticsearchVersion = Version.fromString(versions.get("elasticsearch")) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Replaces the VersionProperties
with extension defined by VersionPropertiesPlugin
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm from just looking at the code. but do you have an example build that shows the problem or shows the fix?
Ensuring that only relevant branches are considered.
The problem is visible if you'll try to re-sync Gradle project in IntelliJ on 9.0 or 8.18 branch. It ends up with:
9.0: https://gradle-enterprise.elastic.co/s/vrn7k6r7kgn46 |
shouldRunFwcFor() { | ||
local branch=$1 | ||
for fwc_branch in "${FWC_BRANCHES[@]}"; do | ||
if [[ "$fwc_branch" == "$branch" ]]; then | ||
return 0 | ||
fi | ||
done | ||
return 1 | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This now also changes on which branches the FwC tests will run.
Utilize Buildkite matrix syntax and escape env in command.
- label: "{{matrix.FWC_VERSION}}" / fwc | ||
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pipeline definition updated because it wasn't running correctly:
https://buildkite.com/elastic/elasticsearch-periodic-fwc/builds/564
With this change it takes into account that not all versions have previous minor unreleased version (because we are on the oldest active development branch), or that current version has minor == 0 (e.g. 9.0) so previous minor have to be calculated differently. * Add FwC branch configuration and update periodic trigger logic Ensuring that only relevant branches are considered. * Correct FWC periodic pipeline variables Utilize Buildkite matrix syntax and escape env in command.
With this change it takes into account that not all versions have previous minor unreleased version (because we are on the oldest active development branch), or that current version has minor == 0 (e.g. 9.0) so previous minor have to be calculated differently. * Add FwC branch configuration and update periodic trigger logic Ensuring that only relevant branches are considered. * Correct FWC periodic pipeline variables Utilize Buildkite matrix syntax and escape env in command.
With this change it takes into account that not all versions have previous minor unreleased version (because we are on the oldest active development branch), or that current version has minor == 0 (e.g. 9.0) so previous minor have to be calculated differently. * Add FwC branch configuration and update periodic trigger logic Ensuring that only relevant branches are considered. * Correct FWC periodic pipeline variables Utilize Buildkite matrix syntax and escape env in command.
💔 Backport failed
You can use sqren/backport to manually backport by running |
With this change it takes into account that not all versions have previous minor unreleased version (because we are on the oldest active development branch), or that current version has minor == 0 (e.g. 9.0) so previous minor have to be calculated differently. * Add FwC branch configuration and update periodic trigger logic Ensuring that only relevant branches are considered. * Correct FWC periodic pipeline variables Utilize Buildkite matrix syntax and escape env in command. (cherry picked from commit 8d193f4) # Conflicts: # build-tools-internal/src/main/groovy/elasticsearch.fwc-test.gradle
💚 All backports created successfully
Questions ?Please refer to the Backport tool documentation |
With this change it takes into account that not all versions have previous minor unreleased version (because we are on the oldest active development branch), or that current version has minor == 0 (e.g. 9.0) so previous minor have to be calculated differently. * Add FwC branch configuration and update periodic trigger logic Ensuring that only relevant branches are considered. * Correct FWC periodic pipeline variables Utilize Buildkite matrix syntax and escape env in command.
With this change it takes into account that not all versions have previous minor unreleased version (because we are on the oldest active development branch), or that current version has minor == 0 (e.g. 9.0) so previous minor have to be calculated differently. * Add FwC branch configuration and update periodic trigger logic Ensuring that only relevant branches are considered. * Correct FWC periodic pipeline variables Utilize Buildkite matrix syntax and escape env in command.
With this change it takes into account that not all versions have previous minor unreleased version (because we are on the oldest active development branch), or that current version has minor == 0 (e.g. 9.0) so previous minor have to be calculated differently. * Add FwC branch configuration and update periodic trigger logic Ensuring that only relevant branches are considered. * Correct FWC periodic pipeline variables Utilize Buildkite matrix syntax and escape env in command.
With this change it takes into account that not all versions have previous minor unreleased version (because we are on the oldest active development branch), or that current version has minor == 0 (e.g. 9.0) so previous minor have to be calculated differently. * Add FwC branch configuration and update periodic trigger logic Ensuring that only relevant branches are considered. * Correct FWC periodic pipeline variables Utilize Buildkite matrix syntax and escape env in command.
With this change it takes into account that not all versions have previous minor unreleased version (because we are on the oldest active development branch), or that current version has minor == 0 (e.g. 9.0) so previous minor have to be calculated differently. * Add FwC branch configuration and update periodic trigger logic Ensuring that only relevant branches are considered. * Correct FWC periodic pipeline variables Utilize Buildkite matrix syntax and escape env in command.
With this change it takes into account that not all versions have previous minor unreleased version (because we are on the oldest active development branch), or that current version has minor == 0 (e.g. 9.0) so previous minor have to be calculated differently. * Add FwC branch configuration and update periodic trigger logic Ensuring that only relevant branches are considered. * Correct FWC periodic pipeline variables Utilize Buildkite matrix syntax and escape env in command.
With this change it takes into account: