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

New VMs: include netavark in prior-fedora #325

Merged
merged 1 commit into from Feb 1, 2024

Conversation

edsantiago
Copy link
Collaborator

CNI is deprecated, and will no longer be tested in CI (Podman
PR 21410).

We've been force-removing netavark from prior-fedora. Remove
this special case so now all fedorae have netavark.

Signed-off-by: Ed Santiago santiago@redhat.com

None

Copy link

Cirrus CI build successful. Found built image names and IDs:

Stage Image Name IMAGE_SUFFIX
base debian do-not-use
base fedora do-not-use
base fedora-aws do-not-use
base fedora-aws-arm64 do-not-use
base image-builder do-not-use
base prior-fedora do-not-use
cache build-push c20240129t175101z-f39f38d13
cache debian c20240129t175101z-f39f38d13
cache fedora c20240129t175101z-f39f38d13
cache fedora-aws c20240129t175101z-f39f38d13
cache fedora-netavark c20240129t175101z-f39f38d13
cache fedora-netavark-aws-arm64 c20240129t175101z-f39f38d13
cache fedora-podman-aws-arm64 c20240129t175101z-f39f38d13
cache fedora-podman-py c20240129t175101z-f39f38d13
cache prior-fedora c20240129t175101z-f39f38d13
cache rawhide c20240129t175101z-f39f38d13
cache win-server-wsl c20240129t175101z-f39f38d13

@edsantiago
Copy link
Collaborator Author

Compared to #324

debian prior-fedora fedora fedora-aws rawhide
base 13 38-1.6 39-1.5 - 40-0
aardvark-dns 1.4.0-5 1.9.0-1 - <- 1.9.0-1 1.9.0-1 - <- 1.9.0-1
buildah 1.33.3+ds1-2 1.33.2-1 1.34.0-1 1.33.2-1 1.34.0-1
conmon 2.1.6+ds1-1 2:2.1.8-2 2:2.1.8-2 2:2.1.8-2 2:2.1.8-2
container-selinux - 2:2.227.0-1 2:2.229.0-1 <- 2:2.228.1-1 2:2.228.1-1 2:2.229.0-1
containers-common - 4:1-89 4:1-95 4:1-95 5:0.57.1-1
criu 3.17.1-3 3.18-1 3.19-2 3.19-2 3.19-2
crun 1.14-1 1.12-1 1.14-1 1.13-1 1.14-1
golang 2:1.21~2 1.20.13-1 1.21.6-1 1.21.6-1 1.22~rc2-1 <- 1.21.6-1
netavark 1.4.0-4 1.9.0-1 1.10.1-1 <- 1.9.0-1 1.9.0-1 1.10.1-1 <- 1.9.0-1
passt 2023-12-30 2023-12-30 - 2023-12-30 2023-12-30
podman 4.9.0+ds1-2 5:4.8.3-1 5:4.9.0-1 5:4.8.3-1 5:4.9.0-1
runc 1.1.10+ds1-1 2:1.1.8-1 2:1.1.8-1 2:1.1.8-1 2:1.1.9-1
skopeo 1.13.3+ds1-2 1:1.14.1-1 <- 1:1.14.0-1 1:1.14.1-1 1:1.14.0-1 1:1.14.1-1
slirp4netns 1.2.1-1 1.2.2-1 1.2.2-1 1.2.2-1 1.2.2-1
systemd-container 255.3-2 <- 255.3-1 253.15-2 <- 253.14-1 254.8-2 254.8-2 255.3-1 <- 255.2-2
tar - - - - 2:1.35-2

edsantiago added a commit to edsantiago/libpod that referenced this pull request Jan 29, 2024
From containers/automation_images#325

Major change: netavark and aardvark are now included in prior-fedora,
so CNI can be fully eliminated from CI (containers#21410)

Signed-off-by: Ed Santiago <santiago@redhat.com>
@edsantiago
Copy link
Collaborator Author

I guess we'll find out soon enough, but the aardvark line bothers me. It looks like no aardvark got installed for f39 and rawhide?

@edsantiago
Copy link
Collaborator Author

Yep, no aardvark. I'm guessing this is fallout from the weekend netavark SNAFU. Punting until tomorrow.

@ashley-cui
Copy link
Member

Looks like aardvark needs to be included, trips in containers/podman#21366. Weird because it doesn't trip in our current f39, so it has to be installed there right now?

@edsantiago
Copy link
Collaborator Author

See group email. This is (I'm 99% sure) fallout from this weekend's netavark disaster. I just don't understand why that happened.

@cevich
Copy link
Member

cevich commented Jan 29, 2024

Whew! Okay I think they're all closed and linked back to this PR. I can't find a Renovate PR for the podman repo. Was the v20240125 image put in place manually there?

I hope you don't feel bad Ed, this could have happened to anybody.

@edsantiago
Copy link
Collaborator Author

containers/podman#21366 was my PR for the 0125 image, but since it was stalled I decided to repush it with the new 0129 images from today. Then kablooey.

@cevich
Copy link
Member

cevich commented Jan 29, 2024

Then kablooey.

Gotca, so it sounds like there is a risk Renovate could still open a 0125 PR for podman. I've seen it "sleep" on update PRs before, and I also don't have the (deliberately) set update schedules all memorized 🤔

I'm now completely and thoroughly trigger shy when it comes to sending any warning messages to the group. On the off-chance I happen to use some unapproved word. If a "podman-update PR: do not merge" warning mail is urgent and important, somebody else can write it.

@@ -37,7 +37,11 @@ msg "Updating/Installing repos and packages for $OS_REL_VER"

bigto ooe.sh $SUDO dnf update -y

# netavark crisis of 2024-01-27 weekend
timebomb 20240210 "Please remove aardvark-dns from INSTALL_PACKAGES; netavark should Require it"

Copy link
Member

Choose a reason for hiding this comment

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

Thanks for adding this.

Copy link
Member

@cevich cevich left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

Cirrus CI build successful. Found built image names and IDs:

Stage Image Name IMAGE_SUFFIX
base debian do-not-use
base fedora do-not-use
base fedora-aws do-not-use
base fedora-aws-arm64 do-not-use
base image-builder do-not-use
base prior-fedora do-not-use
cache build-push c20240130t133129z-f39f38d13
cache debian c20240130t133129z-f39f38d13
cache fedora c20240130t133129z-f39f38d13
cache fedora-aws c20240130t133129z-f39f38d13
cache fedora-netavark c20240130t133129z-f39f38d13
cache fedora-netavark-aws-arm64 c20240130t133129z-f39f38d13
cache fedora-podman-aws-arm64 c20240130t133129z-f39f38d13
cache fedora-podman-py c20240130t133129z-f39f38d13
cache prior-fedora c20240130t133129z-f39f38d13
cache rawhide c20240130t133129z-f39f38d13
cache win-server-wsl c20240130t133129z-f39f38d13

@cevich
Copy link
Member

cevich commented Jan 30, 2024

I found Renovate's podman update task queued due to rate-limiting, in the dependency dashboard. So indeed it was on a hair-trigger as I feared. Anyhoo, I'm glad this didn't happen in the middle of the night. I tripped it manually just now, and when the PR shows up I'll close it to prevent any accidents.

@edsantiago
Copy link
Collaborator Author

edsantiago commented Jan 30, 2024

Comparing against last week's build

debian prior-fedora fedora fedora-aws rawhide
base 13 38-1.6 39-1.5 - 40-0
aardvark-dns 1.4.0-5 1.9.0-1 1.10.0-1 <- 1.9.0-1 1.9.0-1 1.9.0-1
buildah 1.33.3+ds1-2 1.33.2-1 1.34.0-1 1.33.2-1 1.34.0-1
conmon 2.1.6+ds1-1 2:2.1.8-2 2:2.1.8-2 2:2.1.8-2 2:2.1.8-2
container-selinux - 2:2.227.0-1 2:2.229.0-1 <- 2:2.228.1-1 2:2.228.1-1 2:2.229.0-1
containers-common - 4:1-89 4:1-95 4:1-95 5:0.57.1-1
criu 3.17.1-3 3.18-1 3.19-2 3.19-2 3.19-2
crun 1.14-1 1.12-1 1.14-1 1.14-1 <- 1.13-1 1.14-1
golang 2:1.21~2 1.20.13-1 1.21.6-1 1.21.6-1 1.22~rc2-1 <- 1.21.6-1
netavark 1.4.0-4 1.9.0-1 1.10.1-5 <- 1.9.0-1 1.9.0-1 1.10.1-1 <- 1.9.0-1
passt 2023-12-30 2023-12-30 - 2023-12-30 2023-12-30
podman 4.9.0+ds1-2 5:4.8.3-1 5:4.9.0-1 5:4.9.0-1 <- 5:4.8.3-1 5:4.9.0-1
runc 1.1.10+ds1-1 2:1.1.8-1 2:1.1.8-1 2:1.1.8-1 2:1.1.9-1
skopeo 1.13.3+ds1-2 1:1.14.1-1 <- 1:1.14.0-1 1:1.14.1-1 1:1.14.0-1 1:1.14.1-1
slirp4netns 1.2.1-1 1.2.2-1 1.2.2-1 1.2.2-1 1.2.2-1
systemd-container 255.3-2 <- 255.3-1 253.15-2 <- 253.14-1 254.8-2 254.8-2 255.3-1 <- 255.2-2
tar - - - - 2:1.35-2

edsantiago added a commit to edsantiago/libpod that referenced this pull request Jan 30, 2024
From containers/automation_images#325

Major change: netavark and aardvark are now included in prior-fedora,
so CNI can be fully eliminated from CI (containers#21410)

Signed-off-by: Ed Santiago <santiago@redhat.com>
@edsantiago
Copy link
Collaborator Author

Thanks Chris. It's not a big deal if it had merged, but it wouldn't have merged anyway because CI would've failed.

@cevich
Copy link
Member

cevich commented Jan 30, 2024

it wouldn't have merged anyway because CI would've failed.

Oh whew! Thanks for the extra perspective. It appeared like a dooms-day thing to me. Glad it's not.

@edsantiago edsantiago force-pushed the no_more_cni branch 2 times, most recently from 175c10b to 843f9ef Compare January 30, 2024 16:39
@edsantiago
Copy link
Collaborator Author

Netavark-1.9 is gone from rawhide; I cannot install it.

Netavark-1.10 is broken. A fix is in progress but then it'll have to get built and bodhi'ed etc etc.

CNI is deprecated, and will no longer be tested in CI (Podman
PR 21410).

We've been force-removing netavark from prior-fedora. Remove
this special case so now all fedorae have netavark.

Signed-off-by: Ed Santiago <santiago@redhat.com>
Copy link

github-actions bot commented Feb 1, 2024

Cirrus CI build successful. Found built image names and IDs:

Stage Image Name IMAGE_SUFFIX
base debian do-not-use
base fedora do-not-use
base fedora-aws do-not-use
base fedora-aws-arm64 do-not-use
base image-builder do-not-use
base prior-fedora do-not-use
cache build-push c20240201t143038z-f39f38d13
cache debian c20240201t143038z-f39f38d13
cache fedora c20240201t143038z-f39f38d13
cache fedora-aws c20240201t143038z-f39f38d13
cache fedora-netavark c20240201t143038z-f39f38d13
cache fedora-netavark-aws-arm64 c20240201t143038z-f39f38d13
cache fedora-podman-aws-arm64 c20240201t143038z-f39f38d13
cache fedora-podman-py c20240201t143038z-f39f38d13
cache prior-fedora c20240201t143038z-f39f38d13
cache rawhide c20240201t143038z-f39f38d13
cache win-server-wsl c20240201t143038z-f39f38d13

@edsantiago
Copy link
Collaborator Author

Sigh. Still broken netavark. No point in testing this in podman.

debian prior-fedora fedora fedora-aws rawhide
base 13 38-1.6 39-1.5 ? 40-0
aardvark-dns 1.4.0-5 1.9.0-1 1.10.0-1 1.9.0-1 1.10.0-1
1.9.0-1 ⇑ 1.9.0-1 ⇑
buildah 1.33.3+ds1-2 1.33.2-1 1.34.0-1 1.34.0-1 1.34.0-3
1.33.2-1 ⇑ 1.34.0-1 ⇑
conmon 2.1.6+ds1-1 2:2.1.8-2 2:2.1.8-2 2:2.1.8-2 2:2.1.8-4
2:2.1.8-2 ⇑
container-selinux ? 2:2.227.0-1 2:2.229.0-1 2:2.229.0-1 2:2.229.0-2
2:2.228.1-1 ⇑ 2:2.228.1-1 ⇑ 2:2.229.0-1 ⇑
containers-common ? 4:1-89 4:1-95 4:1-95 5:0.57.1-7
5:0.57.1-1 ⇑
criu 3.17.1-3 3.18-1 3.19-2 3.19-2 3.19-4
3.19-2 ⇑
crun 1.14-1 1.12-1 1.14-1 1.14-1 1.14-1
1.13-1 ⇑
golang 2:1.21~2 1.20.13-1 1.21.6-1 1.21.6-1 1.22~rc2-1
1.21.6-1 ⇑
netavark 1.4.0-4 1.9.0-1 1.10.1-5 1.10.1-5 1.10.1-5
1.9.0-1 ⇑ 1.9.0-1 ⇑ 1.9.0-1 ⇑
passt 2023-12-30 2023-12-30 ? 2023-12-30 2023-12-30
podman 4.9.0+ds1-2 5:4.8.3-1 5:4.9.0-1 5:4.9.0-1 5:4.9.0-1
5:4.8.3-1 ⇑
runc 1.1.10+ds1-1 2:1.1.8-1 2:1.1.8-1 2:1.1.8-1 2:1.1.9-2
2:1.1.9-1 ⇑
skopeo 1.13.3+ds1-2 1:1.14.1-1 1:1.14.1-1 1:1.14.0-1 1:1.14.1-2
1:1.14.0-1 ⇑ 1:1.14.1-1 ⇑
slirp4netns 1.2.1-1 1.2.2-1 1.2.2-1 1.2.2-1 1.2.2-2
1.2.2-1 ⇑
systemd-container 255.3-2 253.15-2 254.8-2 254.8-2 255.3-1
255.3-1 ⇑ 253.14-1 ⇑ 255.2-2 ⇑
tar ? ? ? ? 2:1.35-3
2:1.35-2 ⇑

edsantiago added a commit to edsantiago/libpod that referenced this pull request Feb 1, 2024
From containers/automation_images#325

Major change: netavark and aardvark are now included in prior-fedora,
so CNI can be fully eliminated from CI (containers#21410)

FIXME FIXME FIXME: skip two e2e tests, waiting for new netavark

Signed-off-by: Ed Santiago <santiago@redhat.com>
@edsantiago
Copy link
Collaborator Author

@cevich PTAL when convenient, and merge if acceptable. TL;DR our lack of VMs is causing cascading blocks of important CI changes. Podman tests have passed: containers/podman#21366

I will open a new PR next week to try to bring in a working netavark.

@cevich cevich merged commit 5dfa6ae into containers:main Feb 1, 2024
39 checks passed
@cevich
Copy link
Member

cevich commented Feb 1, 2024

Thanks Ed. Do you have an opinion on if this version should be tagged? Or, should we maybe wait a few days at least maybe?

@edsantiago
Copy link
Collaborator Author

No, absolutely do not tag. Netavark is broken. I will be spinning new VMs again next week. Thanks.

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.

None yet

3 participants