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: roachtest: use 'master' tag for tpc-e docker images #117816

Merged
merged 1 commit into from
Jan 16, 2024

Conversation

srosenberg
Copy link
Member

@srosenberg srosenberg commented Jan 16, 2024

Backport 1/1 commits from #117795.

/cc @cockroachdb/release


In [1], [2], we moved tpc-e docker images from the Docker Hub to a publicly accessible Google Container Registry (under https://us-east1-docker.pkg.dev/v2/crl-ci-images). Consequently, most recent changes to tpc-e are now tagged as 'master'. (This happens as part of the docker GH action upon merging a PR into master.)

[1] https://github.com/cockroachlabs/tpc-e/pull/71
[2] #117691

Epic: none

Release note: None
Release justification: test-only change

In [1], [2], we moved tpc-e docker images from the Docker Hub
to a publicly accessible Google Container Registry
(under https://us-east1-docker.pkg.dev/v2/crl-ci-images).
Consequently, most recent changes to tpc-e are now tagged
as 'master'. (This happens as part of the docker GH action
upon merging a PR into master.)

[1] cockroachlabs/tpc-e#71
[2] cockroachdb#117691

Epic: none

Release note: None
@srosenberg srosenberg requested a review from a team as a code owner January 16, 2024 16:16
@srosenberg srosenberg requested review from DarrylWong and renatolabs and removed request for a team January 16, 2024 16:16
Copy link

blathers-crl bot commented Jan 16, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL and one additional
    TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • 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. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Jan 16, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@srosenberg srosenberg requested a review from rail January 16, 2024 16:17
@srosenberg
Copy link
Member Author

TFTR!

@srosenberg srosenberg merged commit 417c06b into cockroachdb:release-23.1 Jan 16, 2024
5 of 6 checks passed
@renatolabs
Copy link
Contributor

blathers backport 22.2

Copy link

blathers-crl bot commented Feb 2, 2024

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 1c57f85 to blathers/backport-release-22.2-117816: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2 failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants