[release/1.11.x] Update version string on active release branches#13308
Closed
mdeggies wants to merge 2 commits intorelease/1.11.xfrom
Closed
[release/1.11.x] Update version string on active release branches#13308mdeggies wants to merge 2 commits intorelease/1.11.xfrom
mdeggies wants to merge 2 commits intorelease/1.11.xfrom
Conversation
*Background* Pushing per-commit dev images to the `hashicorppreview` dockerhub org was introduced in #13084. On merges to a release branch in the format `release/$MAJOR.$MINOR.x`, artifacts including docker images are built, tagged, and pushed to `hashicorppreview` under the tags `$VERSION` and `$VERSION-$GITCOMMIT`. [Note that `$VERSION` includes the prerelease string as a suffix.] The team has automation that runs to pull down these images and run tests against them. *In this PR* This PR suggests changing the `$VERSION` string (and docker tag) on the active release branches [1.10.x, 1.11.x, 1.12.x] to mirror the release branch naming convention, `$MAJOR.$MINOR.x`. Since the tip of the release branch contains the latest patch code changes, using a `.x` instead of pointing to a specific patch version is what we've adopted for release branch naming, and would like to adopt for dev_tags. The version string is updated prior to building for a release, so this should have no adverse effects. *Examples* `hashicorppreview/consul:1.13.0-dev` will become `hashicorppreview/consul:1.13.x-dev` `hashicorppreview/consul:1.13.0-dev-364758ef2f50519cb12585f7148fdcc8f213f27d` will become `hashicorppreview/consul:1.13.x-dev-364758ef2f50519cb12585f7148fdcc8f213f27d`
mdeggies
added
pr/no-metrics-test
pr/no-changelog
mdeggies
changed the title
2 tasks
mdeggies
requested review from
a team,
alvin-huang,
kschoche and
samsalisbury
and removed request for
a team
kschoche
approved these changes
Jun 2, 2022
Contributor
kschoche
left a comment
kschoche
left a comment
There was a problem hiding this comment.
LGTM, thanks!!
- I assume the CI failures are resolved before we merge :-)
2 tasks
samsalisbury
approved these changes
Jun 16, 2022
Member
Author
|
Closing in favor of the other PR's I merged in :D |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Pushing per-commit dev images to the
hashicorppreviewdockerhub org was introduced in #13084. On merges to a release branch in the formatrelease/$MAJOR.$MINOR.x, artifacts including docker images are built, tagged, and pushed tohashicorppreviewunder the tags$VERSIONand$VERSION-$GITCOMMIT. [Note that$VERSIONincludes the prerelease string as a suffix.] The team has automation that runs to pull down these images and run tests against them.This PR has been updated to follow the guidance outlined in https://docs.google.com/document/d/1ovhf8DmlXbsuc45HkN7LdsrS2J3evfSvcy2LPiyUgZ8/edit. There are two parts to this:
main, will be updated after a release to point to the next minor or major version string. For example, after releasing consul 1.13.0 from branchrelease/1.13.x, the version string inversion.goonrelease/1.13.xshould be updated to1.13.1. If the next release of consul will be a major release, e.g.2.0.0, the version onmainshould be updated to reflect this.dev_tags, the set of tags that are added for per-commit docker image builds, will be stripped of the patch version. For example, ifrelease/1.13.xis an active release branch for1.13, the dev_tags that will be published off of this release branch will be namedhashicorppreview/consul:1.13-devandhashicorppreview/consul:1.13-dev-$COMMITSHA.hashicorppreview/consul:1.13-devwill be kept up to date with the latest builds from branchrelease/1.13.x.Testing & Reproduction steps
hashicorppreview/consul:1.13.0-devwill becomehashicorppreview/consul:1.13-devhashicorppreview/consul:1.13.0-dev-364758ef2f50519cb12585f7148fdcc8f213f27dwill becomehashicorppreview/consul:1.13-dev-364758ef2f50519cb12585f7148fdcc8f213f27dPR Checklist