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

roachtest: use 'master' tag for tpc-e docker images #117795

Merged

Conversation

srosenberg
Copy link
Member

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

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 04:21
@srosenberg srosenberg requested review from DarrylWong and renatolabs and removed request for a team January 16, 2024 04:21
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@srosenberg srosenberg added backport-23.1.x Flags PRs that need to be backported to 23.1 backport-23.2.x Flags PRs that need to be backported to 23.2. labels Jan 16, 2024
@srosenberg srosenberg requested a review from rail January 16, 2024 04:21
@srosenberg
Copy link
Member Author

TFTR!

bors r=rail

@craig
Copy link
Contributor

craig bot commented Jan 16, 2024

Build succeeded:

@craig craig bot merged commit 3ccf718 into cockroachdb:master Jan 16, 2024
9 checks passed
Copy link

blathers-crl bot commented Jan 16, 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 3642993 to blathers/backport-release-23.1-117795: 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 23.1.x failed. See errors above.


error creating merge commit from 3642993 to blathers/backport-release-23.2-117795: 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 23.2.x 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-23.1.x Flags PRs that need to be backported to 23.1 backport-23.2.x Flags PRs that need to be backported to 23.2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants