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.

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

Rework bwc snapshot projects to build up to two bwc versions #24870

Merged
merged 5 commits into from
May 29, 2017

Conversation

nik9000
Copy link
Member

@nik9000 nik9000 commented May 24, 2017

Removes the distribution:bwc project in favor of
distribution:bwc-release-snapshot and
distribution:bwc-stable-snapshot.
distribution:bwc-release-snapshot builds a snapshot of the
latest release branch (5.4 now) if needed for backwards
compatibility. distribution:bwc-stable-snapshot builds a
snapshot of the latest stable branch (5.x now) if needed for
backwards compatibility.

I edited the description to match what was actually committed. This was the old description for posterity:

Adds the :distribution:bwc-stable project which builds the previous
stable branch when :distribution:bwc is building an unreleased
branch. When :distribution:bwc builds a released branch then
:distribution:bwc-stable is an empty build, not used or depended
on by anything.

Requires #24798

Adds the `:distribution:bwc-stable` project which builds the previous
stable branch when `:distribution:bwc` is building an unreleased
branch. When `:distribution:bwc` builds a released branch then
`:distribution:bwc-stable` is an empty build, not used or depended
on by anything.

Relates to elastic#24798
@nik9000 nik9000 added :Delivery/Build Build or test infrastructure review v6.0.0 labels May 24, 2017
@nik9000
Copy link
Member Author

nik9000 commented May 24, 2017

Let the naming debates begin!

@rjernst
Copy link
Member

rjernst commented May 25, 2017

I think you have the names mixed up. We currently have master, which is the unstable branch, 5.x which is the stable branch, and 5.4 which is our current release branch. But with this change, bwc-stable will build 5.4 snapshot, correct? Can we have bwc-release and bwc-stable? If on stable branch, then versions[-1] should be linked to bwc-release. If on unstable branch, then versions[-1] linked to bwc-stable and versions[-2] to bwc-release.

Now we have `bwc-release` and `bwc-stable`. `bwc-release` is used
to build release branches - 5.4 in master, 5.5 eventually, etc.
`bwc-stable` is used for building unstable branches - `5.x` in
master, `6.x` eventually.

These names line up with the way folks talk about the names of
Lucene's branches. Those names make sense so we may as well use
them for our own branches.
@nik9000
Copy link
Member Author

nik9000 commented May 26, 2017

@rjernst I've reworked the names so they line up. bwc-stable is only used when building 5.x, bwc-release is used when building 5.4.

Copy link
Member

@rjernst rjernst left a comment

Choose a reason for hiding this comment

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

Thank you, this looks good! I just have one more very minor request. Upon further reflection, I think it would be good to suffix these projects with -snapshot? So bwc-stable-snapshot and bwc-release-snapshot?

@nik9000
Copy link
Member Author

nik9000 commented May 26, 2017 via email

@nik9000
Copy link
Member Author

nik9000 commented May 29, 2017

Ok - I've made the changes and will merge in a moment. I plan to just merge to master because we aren't super likely to need it in 5.x. At least I don't think we are....

@nik9000 nik9000 changed the title Adds a :distribution:bwc-stable project Rework bwc snapshot projects to build up to two bwc versions May 29, 2017
@nik9000 nik9000 merged commit bc4df47 into elastic:master May 29, 2017
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request May 29, 2017
* master:
  Add a second refresh to concurrent relocation test
  Add a dummy_index to upgrade tests to ensure we recover fine with replicas (elastic#24937)
  Rework bwc snapshot projects to build up to two bwc versions (elastic#24870)
  Move the IndexDeletionPolicy to be engine internal (elastic#24930)
  [Tests] Harden InternalExtendedStatsTests (elastic#24934)
  TCorrecting api name (elastic#24924)
  Add search method to high level REST client (elastic#24796)
  Add fromXContent method to ClearScrollResponse (elastic#24909)
  ClearScrollRequest to implement ToXContentObject (elastic#24907)
  SearchScrollRequest to implement ToXContentObject (elastic#24906)
  Fix bug in weight computation for query cache
@nik9000 nik9000 deleted the build_stable_branch branch June 7, 2017 14:51
@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
Labels
:Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team v6.0.0-alpha2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants