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

Cherry pick #57952 to 23.8: Fix docker image for integration tests (fixes CI) #57955

Conversation

robot-ch-test-poll1
Copy link
Contributor

Original pull-request #57952

This pull-request is a first step of an automated backporting.
It contains changes similar to calling git cherry-pick locally.
If you intend to continue backporting the changes, then resolve all conflicts if any.
Otherwise, if you do not want to backport them, then just close this pull-request.

The check results does not matter at this step - you can safely ignore them.

Note

This pull-request will be merged automatically. Please, do not merge it manually (but if you accidentally did, nothing bad will happen).

Troubleshooting

If the PR was manually reopened after being closed

If this PR is stuck (i.e. not automatically merged after one day), check #57952 for pr-backports-created label and delete it.

Manually merging will do nothing. The pr-backports-created label prevents the original PR #57952 from being processed.

If the conflicts were resolved in a wrong way

If this cherry-pick PR is completely screwed by a wrong conflicts resolution, and you want to recreate it:

  • delete the pr-cherrypick label from the PR
  • delete this branch from the repository

You also need to check the original PR #57952 for pr-backports-created, and delete if it's presented there

azat and others added 2 commits December 16, 2023 21:51
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
Fix docker image for integration tests (fixes CI)
@robot-ch-test-poll1 robot-ch-test-poll1 added pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only! do not test disable testing on pull request labels Dec 17, 2023
@robot-ch-test-poll1 robot-ch-test-poll1 merged commit 652d5e4 into backport/23.8/57952 Dec 17, 2023
34 of 35 checks passed
@robot-ch-test-poll1 robot-ch-test-poll1 deleted the cherrypick/23.8/32d73a0188a530812981f50afc0d4598f47828de branch December 17, 2023 01:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do not test disable testing on pull request pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants