Skip to content

[release/1.3] Don't clash with GH Actions runner's containerd#4382

Closed
estesp wants to merge 1 commit intocontainerd:release/1.3from
estesp:bp-containerd-clashing
Closed

[release/1.3] Don't clash with GH Actions runner's containerd#4382
estesp wants to merge 1 commit intocontainerd:release/1.3from
estesp:bp-containerd-clashing

Conversation

@estesp
Copy link
Copy Markdown
Member

@estesp estesp commented Jul 15, 2020

backport #4380 to release/1.3

GH runners now have a systemd-run containerd running on the standard
socket, impacting the CRI test's expectation of our CI-built containerd
running there.

Signed-off-by: Phil Estes <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jul 15, 2020

Build succeeded.

@estesp estesp force-pushed the bp-containerd-clashing branch from c93fbd9 to 4f64a97 Compare July 15, 2020 20:32
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jul 15, 2020

Build succeeded.

@estesp
Copy link
Copy Markdown
Member Author

estesp commented Jul 15, 2020

Looks like I will get caught in the same spiral as #4361 needing several other backports to pass integration (the sync delete -> TestImageUsage problems)

@joejulian
Copy link
Copy Markdown

Should I just include this cherry-pick in my PR?

@estesp
Copy link
Copy Markdown
Member Author

estesp commented Jul 16, 2020

yup, looks good. I'll close this.

@estesp estesp closed this Jul 16, 2020
@estesp estesp deleted the bp-containerd-clashing branch July 16, 2020 01:53
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.

2 participants