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

release-23.1: build,release: provide way to inject build tag override, use in MAPB #101998

Merged
merged 1 commit into from
Apr 21, 2023

Conversation

rail
Copy link
Member

@rail rail commented Apr 21, 2023

Backport 1/1 commits from #101943.

/cc @cockroachdb/release


When we build nightly builds, we build them in "release" configuration. Because we do this, the build tag reported by these binaries from cockroach version has been identical to that of an actual release binary, which is very confusing. Here we update the script to build these nightlies (make-and-publish-build-artifacts.sh) to inject an appropriate, identifiable build tag.

It is probably wrong that we are building these nightlies as if they were "releases". We'll follow up with work to fix this and refine the build tags further.

Closes #100532.
Epic: None
Release note (build change): Update reported Build Tag for nightly (non-release) builds
Release justification: GA blocker

When we build nightly builds, we build them in "release" configuration.
Because we do this, the build tag reported by these binaries from
`cockroach version` has been identical to that of an actual release
binary, which is very confusing. Here we update the script to build
these nightlies (`make-and-publish-build-artifacts.sh`) to inject an
appropriate, identifiable build tag.

It is probably wrong that we are building these nightlies as if they
were "releases". We'll follow up with work to fix this and refine the
build tags further.

Closes cockroachdb#100532.
Epic: None
Release note (build change): Update reported `Build Tag` for nightly (non-release) builds
@rail rail added C-enhancement Solution expected to add code/behavior + preserve backward-compat (pg compat issues are exception) T-dev-inf A-ci Continuous Integration labels Apr 21, 2023
@rail rail requested a review from jlinder April 21, 2023 13:55
@rail rail requested a review from a team as a code owner April 21, 2023 13:55
@blathers-crl
Copy link

blathers-crl bot commented Apr 21, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-ci Continuous Integration C-enhancement Solution expected to add code/behavior + preserve backward-compat (pg compat issues are exception) T-dev-inf
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants