Skip to content

Backport of ci: ensure int test docker pull goes through proxy into release/1.19.x#21825

Merged
zalimeni merged 1 commit into
release/1.19.xfrom
backport/zalimeni/fix-docker-pull-int-test/genuinely-thorough-porpoise
Oct 14, 2024
Merged

Backport of ci: ensure int test docker pull goes through proxy into release/1.19.x#21825
zalimeni merged 1 commit into
release/1.19.xfrom
backport/zalimeni/fix-docker-pull-int-test/genuinely-thorough-porpoise

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

This PR is auto-generated from #21819 to be assessed for backporting due to the inclusion of the label backport/1.19.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@zalimeni
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


So we don't get rate limited.

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hashicorp-cla-app
Copy link
Copy Markdown

hashicorp-cla-app Bot commented Oct 14, 2024

CLA assistant check
All committers have signed the CLA.

@hashicorp-cla-app
Copy link
Copy Markdown

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@zalimeni zalimeni force-pushed the backport/zalimeni/fix-docker-pull-int-test/genuinely-thorough-porpoise branch from 8732db4 to 5986d5a Compare October 14, 2024 19:25
@zalimeni zalimeni marked this pull request as ready for review October 14, 2024 19:25
@zalimeni zalimeni enabled auto-merge (squash) October 14, 2024 19:25
@zalimeni zalimeni merged commit 3a93f89 into release/1.19.x Oct 14, 2024
@zalimeni zalimeni deleted the backport/zalimeni/fix-docker-pull-int-test/genuinely-thorough-porpoise branch October 14, 2024 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants