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.

Sign up for GitHub

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

Jump to bottom

ci(.github): enable self hosted runners for AMD64 E2E tasks (backport of #10945) #12276

Merged
merged 5 commits into from
Dec 16, 2024
Merged

ci(.github): enable self hosted runners for AMD64 E2E tasks (backport of #10945) #12276

merged 5 commits into from
Dec 16, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Dec 16, 2024

Automatic cherry-pick of #10945 for branch release-2.6

Generated by action

cherry-picked commit 126029d
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.6
Your branch is up to date with 'origin/release-2.6'.

You are currently cherry-picking commit 126029d11.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   mk/kind.mk
	modified:   test/kind/cluster-ipv6-kuma-1.yaml
	modified:   test/kind/cluster-ipv6-kuma-2.yaml
	modified:   test/kind/cluster-ipv6.yaml
	modified:   test/kind/cluster-kuma-1.yaml
	modified:   test/kind/cluster-kuma-2.yaml
	modified:   test/kind/cluster.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/_test.yaml
	both modified:   .github/workflows/build-test-distribute.yaml
	both modified:   .github/workflows/e2e.yaml
	both modified:   mk/k3d.mk

@kumahq kumahq bot requested a review from a team as a code owner December 16, 2024 12:53
@kumahq kumahq bot requested review from michaelbeaumont and Icarus9913 and removed request for a team December 16, 2024 12:53
jijiechen and others added 4 commits December 16, 2024 14:43
@jijiechen @lahabana @lukidzi
ci(.github): enable self hosted runners for AMD64 E2E tasks (#10945)
bbf56cf 
* ci(.github): enable self hosted runners for AMD64 e2e tasks
* add image pulling steps
* add a script to sync docker credentials into k3d/kind clusters
* use docker credentials when creating clusters
---------

Signed-off-by: Jay Chen <1180092+jijiechen@users.noreply.github.com>
Signed-off-by: Charly Molter <charly.molter@konghq.com>
Co-authored-by: Charly Molter <charly.molter@konghq.com>
Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
@lukidzi
resolve conflicts
4da0b57 
Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
@lukidzi
fix
450e7d1 
Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
@lukidzi
fix
cd03280 
Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
@lukidzi lukidzi force-pushed the chore/backport-release-2.6-10945 branch from efd9b3d to cd03280 Compare December 16, 2024 13:43
@lukidzi lukidzi removed the conflict label Dec 16, 2024
@lukidzi
fix format
440bec0 
Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
@lukidzi lukidzi enabled auto-merge (squash) December 16, 2024 14:43
@lukidzi lukidzi merged commit 2a6e768 into release-2.6 Dec 16, 2024
12 checks passed
@lukidzi lukidzi deleted the chore/backport-release-2.6-10945 branch December 16, 2024 14:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lukidzi lukidzi lukidzi approved these changes

@michaelbeaumont michaelbeaumont Awaiting requested review from michaelbeaumont michaelbeaumont is a code owner automatically assigned from kumahq/kuma-maintainers

@Icarus9913 Icarus9913 Awaiting requested review from Icarus9913 Icarus9913 is a code owner automatically assigned from kumahq/kuma-maintainers

Assignees
No one assigned
Labels
release-2.6
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lukidzi @jijiechen