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

[CI-only] Update dev image tagging on 1.11.x #13539

Merged
merged 4 commits into from
Jun 24, 2022
Merged

Conversation

mdeggies
Copy link
Member

@mdeggies mdeggies commented Jun 21, 2022

Description

Pushing per-commit dev images to the hashicorppreview dockerhub org was introduced in #13084, but the tag names have been unclear.

This PR has been created to follow the guidance outlined in https://docs.google.com/document/d/1ovhf8DmlXbsuc45HkN7LdsrS2J3evfSvcy2LPiyUgZ8/edit for dev image naming, and for keeping the version string in version.go up to date. There are two parts to this:

  1. Keeping the version strings in version.go on each active release branch, and on main, updated after a release to point to the next minor or major version string. For example, after releasing consul 1.11.6 from branch release/1.11.x, the version string in version.go on release/1.11.x should be updated to 1.11.7.
  2. dev_tags, the set of tags that are created for per-commit docker image builds, will be stripped of the patch version. For example, on release/1.11.x, the dev_tags that will be published off of this release branch will be named hashicorppreview/consul:1.11-dev and hashicorppreview/consul:1.11-dev-$COMMITSHA. hashicorppreview/consul:1.11-dev will be kept up to date with the latest builds from branch release/1.11.x.

Testing & Reproduction steps

Dev tags published on this release branch will be named in the following format: hashicorppreview/consul:1.11-dev, hashicorppreview/consul:1.11-$COMMITSHA-dev. See https://hub.docker.com/r/hashicorppreview/consul/tags?page=1&name=1.11-dev to pull the dev image built from commit 263422c (https://github.com/hashicorp/consul/runs/6994186153) from this PR.

Other PR's in this series

Changes to target release/1.12.x: #13540
Changes to target main: #13541

@github-actions github-actions bot added the theme/contributing Additions and enhancements to community contributing materials label Jun 21, 2022
//
// Version must conform to the format expected by github.com/hashicorp/go-version
// for tests to work.
Version = "1.11.3"
Version = "1.11.7"
Copy link
Member Author

Choose a reason for hiding this comment

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

Since the current version of consul on release/1.11.x is 1.11.6, this has been bumped to the NEXT version, 1.11.7. After 1.11.7 is released, this version should be bumped to 1.11.8 if there will be another patch in this series.

@mdeggies mdeggies added pr/no-changelog PR does not need a corresponding .changelog entry pr/no-metrics-test labels Jun 21, 2022
@mdeggies mdeggies requested a review from eculver June 21, 2022 22:54
@mdeggies
Copy link
Member Author

This was reviewed for main over in #13541, so I'm going to go ahead and merge this.

@mdeggies mdeggies merged commit bda6882 into release/1.11.x Jun 24, 2022
@mdeggies mdeggies deleted the dev-tags-1.11.x branch June 24, 2022 20:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/no-changelog PR does not need a corresponding .changelog entry pr/no-metrics-test theme/contributing Additions and enhancements to community contributing materials
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant