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

Fix transition test to work with latest selinux policy #4829

Merged
merged 2 commits into from
Jun 29, 2023

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented May 30, 2023

What type of PR is this?

/kind api-change
/kind bug
/kind cleanup
/kind deprecation
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake
/kind other

What this PR does / why we need it:

How to verify it

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

[CI:NEXT]

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 30, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@rhatdan
Copy link
Member Author

rhatdan commented May 30, 2023

This PR needs an updated container-selinux 2.216.0 PR.
containers/container-selinux#250

@lsm5
Copy link
Member

lsm5 commented May 30, 2023

This PR needs an updated container-selinux 2.216.0 PR. containers/container-selinux#250

once that merges, we should use the [CI:NEXT] keyword so packages from rhcontainerbot/podman-next will be fetched instead of the ones in the image.

@rhatdan
Copy link
Member Author

rhatdan commented May 30, 2023

Fixes: #4772

@rhatdan
Copy link
Member Author

rhatdan commented May 30, 2023

@lsm5 lsm5 changed the title Fix transition test to work with latest selinux policy [CI:NEXT] Fix transition test to work with latest selinux policy May 30, 2023
@lsm5
Copy link
Member

lsm5 commented May 30, 2023

@cevich is containers/podman#18439 (comment) still valid here for [CI:NEXT] or have things changed?

@lsm5
Copy link
Member

lsm5 commented May 30, 2023

@cevich is containers/podman#18439 (comment) still valid here for [CI:NEXT] or have things changed?

also, any reason the PR needs to be turned into draft?

@cevich
Copy link
Member

cevich commented May 30, 2023

still valid here for [CI:NEXT] or have things changed?

Nope, that magic string isn't setup in buildah CI. May I assume from the question, that it's needed here?

also, any reason the PR needs to be turned into draft?

Yes, this is really important. In podman CI, the [CI:NEXT] magic is setup to fail if the PR is not a draft. Since draft's cannot be merged, this forces removal of the [CI:NEXT] magic and a re-run of the PR changes through regular CI to ensure it's also happy.

@lsm5
Copy link
Member

lsm5 commented May 30, 2023

still valid here for [CI:NEXT] or have things changed?

Nope, that magic string isn't setup in buildah CI. May I assume from the question, that it's needed here?

Yes, we just merged a change in container-selinux, a new version has been cut but updates-testing / stable updates will take a while, so we need to fetch from podman-next.

also, any reason the PR needs to be turned into draft?

Yes, this is really important. In podman CI, the [CI:NEXT] magic is setup to fail if the PR is not a draft. Since draft's cannot be merged, this forces removal of the [CI:NEXT] magic and a re-run of the PR changes through regular CI to ensure it's also happy.

Got it, thanks

@cevich
Copy link
Member

cevich commented May 30, 2023

Yes, we just...

Okay, I'll start work on porting that here from podman CI.

@cevich
Copy link
Member

cevich commented May 30, 2023

Opened #4830

@TomSweeneyRedHat
Copy link
Member

LGTM once the underlying dependencies are tended to.

@rhatdan rhatdan changed the title [CI:NEXT] Fix transition test to work with latest selinux policy Fix transition test to work with latest selinux policy Jun 9, 2023
@rhatdan
Copy link
Member Author

rhatdan commented Jun 9, 2023

@cevich I am trying to move buildah to testing f37 and f38. But it is blowing up?

@cevich
Copy link
Member

cevich commented Jun 9, 2023

I am trying to move buildah to testing f37 and f38. But it is blowing up?

Can I assume this needs the new/recently build container-selinux packages? If so, those are in c20230517t144652z-f38f37d12 not the older c20230426t140447z-f38f37d12. BUT those images come with 60k lines of probably necessary baggage.

Otherwise, WRT the Smoke Test failure:

[+0013s] ./tests/tools/build/golangci-lint run --deadline=20m --color=always -j1
[+0200s] make: *** [Makefile:198: lint] Killed

Those can be a major PITA to debug 😠 In the distant past, I've seen that failure-mode caused by broken golangci-lint plugins and/or not enough memory on the system. I don't think the later is the problem here since .cirrus.yml says:

    gce_instance:
        memory: "12Gb"

But maybe that's whats happening? Though it could also easily be another flavor of the golang 1.20 based panic I ran into in #4772. In that PR it was more obvious, with a giant PANIC message and traceback.

Hmmm...it's not a timeout problem. Gosh...I'm not really sure what else to suggest 😞

@rhatdan
Copy link
Member Author

rhatdan commented Jun 10, 2023

@cevich could you update to f37 and f38 in a separate PR, to what we should be using. Then I can rebase this PR on the latest.

@cevich
Copy link
Member

cevich commented Jun 12, 2023

could you update to f37 and f38 in a separate PR

I can...but it will immediately fail CI due to golang-ci shenanigans 😢

@cevich
Copy link
Member

cevich commented Jun 12, 2023

Ref: Opened #4863 to see if not including the CI VM image updates makes CI testing any smoother.

@cevich
Copy link
Member

cevich commented Jun 12, 2023

@rhatdan okay #4863 is merged, so #4772 only has the CI VM updates in it now if you want to rebase on it.

@cevich
Copy link
Member

cevich commented Jun 13, 2023

FYI: Opened containers/automation_images#282

@rhatdan rhatdan changed the title Fix transition test to work with latest selinux policy [WIP] Fix transition test to work with latest selinux policy Jun 28, 2023
@rhatdan rhatdan changed the title [WIP] Fix transition test to work with latest selinux policy Fix transition test to work with latest selinux policy Jun 28, 2023
@rhatdan rhatdan force-pushed the selinux branch 3 times, most recently from fa01395 to c53074a Compare June 28, 2023 20:00
@rhatdan rhatdan marked this pull request as ready for review June 29, 2023 11:57
Makefile Outdated
@@ -179,7 +179,8 @@ tests/testreport/testreport: tests/testreport/testreport.go

.PHONY: test-unit
test-unit: tests/testreport/testreport
$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" -cover $(RACEFLAGS) $(shell $(GO) list ./... | grep -v vendor | grep -v tests | grep -v cmd) -timeout 45m
$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" -cover $(RACEFLAGS) $(shell $(GO) list ./... | grep -v vendor | grep -v tests | grep -v cmd | grep -v chroot | grep -v copier) -timeout 45m
$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" $(RACEFLAGS) ./chroot ./copier
Copy link
Member

Choose a reason for hiding this comment

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

Looks like we need to add a -timeout with a value larger than the default 10m here after all.

@cevich
Copy link
Member

cevich commented Jun 29, 2023

Note: In case it helps (i.e. w/ newer SELinux/related packages), I've started building yet-another image update. They're required for podman CI, but I'm happy to coordinate tagging those images until this PR merges - meaning, they'd only be used in podman CI for the near-term.

rhatdan and others added 2 commits June 29, 2023 14:21
The chrooting causes testing with coverage counting enabled to output a
warning message which interferes with how they communicate with child
processes.  Disable -cover for those modules by testing them separately
without it.

Signed-off-by: Nalin Dahyabhai <[email protected]>
Signed-off-by: Daniel J Walsh <[email protected]>
@TomSweeneyRedHat
Copy link
Member

@rhatdan I'll be building a v1.31 this evening. This looks to be the last PR we have pending. If it's still not merged then, we can backport it to the 1.31.0 branch and get it into Podman RC2 next week. @ashley-cui FYI

@rhatdan
Copy link
Member Author

rhatdan commented Jun 29, 2023

I don't think we should release buildah until it passes tests on f38. Unless you want to release buildah as a RC1.

@cevich
Copy link
Member

cevich commented Jun 29, 2023

If it's still not merged then, we can backport it to the 1.31.0 branch and get it into Podman RC2 next week.

I hate to rush anybody. So I'll just point out it would be "nice" to have the F38 CI VM update (included in this PR) pre-baked into the release branch.

It's not completely out of the question to backport the setup, esp. while the new branch is fresh. But it will fairly quickly become a less and less desirable thing to do to a RHEL release branch.

My motivation here is trying to keep the Fedora->RHEL gap as small as possible, and F37 is quite far away from F38 WRT what's going into RHEL - at least that's my wishful thinking. I could be wrong.

@rhatdan
Copy link
Member Author

rhatdan commented Jun 29, 2023

@cevich Once this completes and merges we can bump the VMs again.

@nalind
Copy link
Member

nalind commented Jun 29, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Jun 29, 2023
@openshift-merge-robot openshift-merge-robot merged commit c35eaec into containers:main Jun 29, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 28, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants