Skip to content

Conversation

@lsm5
Copy link
Member

@lsm5 lsm5 commented Jun 3, 2025

What type of PR is this?

/kind other

What this PR does / why we need it:

How to verify it

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?

None

@lsm5 lsm5 changed the base branch from main to release-1.39 June 3, 2025 15:06
@lsm5 lsm5 force-pushed the release-1.39-tmt-rhel branch from a267e14 to 2e0702a Compare June 3, 2025 15:07
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 3, 2025
@packit-as-a-service
Copy link

Ephemeral COPR build failed. @containers/packit-build please check.

@lsm5 lsm5 force-pushed the release-1.39-tmt-rhel branch from 2e0702a to cbdb69b Compare June 3, 2025 15:10
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 3, 2025
@lsm5 lsm5 changed the title Move RHEL branch to TMT [skip-ci] Move RHEL branch to TMT Jun 3, 2025
@lsm5 lsm5 force-pushed the release-1.39-tmt-rhel branch 3 times, most recently from fc995e7 to 230536c Compare June 3, 2025 17:45
@packit-as-a-service
Copy link

Packit jobs failed. @containers/packit-build please check.

@lsm5 lsm5 force-pushed the release-1.39-tmt-rhel branch 10 times, most recently from 8d017ae to 9c9ec1f Compare June 4, 2025 14:20
@lsm5
Copy link
Member Author

lsm5 commented Jun 4, 2025

The validate test uses a bunch of Cirrus variables that I'm not sure can be transferred easily to TMT.

How bad would it be to skip validate test on RHEL branches? I'm guessing there'll be no community contributions directly to RHEL branches, mostly backports / fixes, and quite a few layers of QE.

@containers/buildah-maintainers ^

@lsm5 lsm5 marked this pull request as ready for review June 4, 2025 14:50
@lsm5
Copy link
Member Author

lsm5 commented Jun 4, 2025

/packit test

@lsm5 lsm5 force-pushed the release-1.39-tmt-rhel branch 2 times, most recently from e42fb1c to 597ade8 Compare June 5, 2025 16:52
@lsm5
Copy link
Member Author

lsm5 commented Jun 5, 2025

We'll need branch protection setup to block on the TMT jobs (likewise for every new branch that gets used in RHEL).

Once the PR looks good, I can add that if everyone agrees.

@lsm5 lsm5 force-pushed the release-1.39-tmt-rhel branch 7 times, most recently from e60657a to ddca779 Compare June 13, 2025 16:18
@lsm5
Copy link
Member Author

lsm5 commented Jun 13, 2025

make lint is failing on CI and also on my local env. Let me know if anyone got a fix for that, or else I'd like to skip it.

go build -o build/golangci-lint ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
make[1]: Leaving directory '/var/ARTIFACTS/work-lintt206ahvk/plans/lint/tree/tests/tools'
./tests/tools/build/golangci-lint run 
run_common.go:384:3: missing type in composite literal (typecheck)
		{Name: string(specs.CgroupNamespace), Host: cfg.CgroupNS() == "host"},
		^
run_common.go:385:3: missing type in composite literal (typecheck)
		{Name: string(specs.IPCNamespace), Host: cfg.IPCNS() == "host"},
		^
run_common.go:386:3: missing type in composite literal (typecheck)
		{Name: string(specs.MountNamespace), Host: false},
		^
run_common.go:379:2: declared and not used: cfg (typecheck)
	cfg, err := config.Default()
	^
cmd/buildah/from.go:236:48: iopts.Isolation undefined (type fromReply has no field or method Isolation) (typecheck)
	isolation, err := parse.IsolationOption(iopts.Isolation)
	                                              ^
cmd/buildah/from.go:256:69: iopts.CapAdd undefined (type fromReply has no field or method CapAdd) (typecheck)
	capabilities, err := defaultContainerConfig.Capabilities("", iopts.CapAdd, iopts.CapDrop)
	                                                                   ^
cmd/buildah/from.go:263:44: iopts.DecryptionKeys undefined (type fromReply has no field or method DecryptionKeys) (typecheck)
	decConfig, err := cli.DecryptConfig(iopts.DecryptionKeys)
	                                          ^
cmd/buildah/from.go:272:32: iopts.GroupAdd undefined (type fromReply has no field or method GroupAdd) (typecheck)
		GroupAdd:              iopts.GroupAdd,
		                             ^
cmd/buildah/from.go:280:32: iopts.CNIPlugInPath undefined (type fromReply has no field or method CNIPlugInPath) (typecheck)
		CNIPluginPath:         iopts.CNIPlugInPath,
		                             ^
cmd/buildah/from.go:281:32: iopts.CNIConfigDir undefined (type fromReply has no field or method CNIConfigDir) (typecheck)
		CNIConfigDir:          iopts.CNIConfigDir,
		                             ^
cmd/buildah/from.go:286:32: iopts.BlobCache undefined (type fromReply has no field or method BlobCache) (typecheck)
		BlobDirectory:         iopts.BlobCache,
		                             ^
cmd/buildah/from.go:287:32: iopts.Devices undefined (type fromReply has no field or method Devices) (typecheck)
		DeviceSpecs:           iopts.Devices,
		                             ^
cmd/buildah/from.go:288:32: iopts.Retry undefined (type fromReply has no field or method Retry) (typecheck)
		MaxPullRetries:        iopts.Retry,
		                             ^
cmd/buildah/from.go:290:32: iopts.CDIConfigDir undefined (type fromReply has no field or method CDIConfigDir) (typecheck)
		CDIConfigDir:          iopts.CDIConfigDir,
		                             ^
cmd/buildah/from.go:293:11: iopts.RetryDelay undefined (type fromReply has no field or method RetryDelay) (typecheck)
	if iopts.RetryDelay != "" {
	         ^
cmd/buildah/from.go:294:58: iopts.RetryDelay undefined (type fromReply has no field or method RetryDelay) (typecheck)
		options.PullRetryDelay, err = time.ParseDuration(iopts.RetryDelay)
		                                                       ^
cmd/buildah/from.go:296:86: iopts.RetryDelay undefined (type fromReply has no field or method RetryDelay) (typecheck)
			return fmt.Errorf("unable to parse value provided %q as --retry-delay: %w", iopts.RetryDelay, err)
			                                                                                  ^
cmd/buildah/run.go:171:27: iopts.CNIPlugInPath undefined (type runInputOptions has no field or method CNIPlugInPath) (typecheck)
		CNIPluginPath:    iopts.CNIPlugInPath,
		                        ^
cmd/buildah/run.go:172:27: iopts.CNIConfigDir undefined (type runInputOptions has no field or method CNIConfigDir) (typecheck)
		CNIConfigDir:     iopts.CNIConfigDir,
		                        ^
level=error msg="Timeout exceeded: try increasing it by passing --timeout option"
make: *** [Makefile:193: lint] Error 4
make: Leaving directory '/var/ARTIFACTS/work-lintt206ahvk/plans/lint/tree'
Shared connection to 10.31.40.144 closed.

@lsm5 lsm5 force-pushed the release-1.39-tmt-rhel branch 2 times, most recently from db92450 to be4501c Compare June 13, 2025 18:11
@lsm5 lsm5 marked this pull request as ready for review June 13, 2025 19:13
@lsm5
Copy link
Member Author

lsm5 commented Jun 13, 2025

opening up for another review. I've kept lint test disabled. The others work. These are no rpms being built. Tests are run directly on binaries built by Makefile.

@lsm5
Copy link
Member Author

lsm5 commented Jun 16, 2025

@containers/buildah-maintainers PTAL.

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

typecheck errors happen when golangci is unable to compile the program, a common issue is a missing library or something like that
But I guess the linter on a backport is not really a critical thing to run so I am fine if this doesn't work

Advantages:
- Test RHEL branches on on actual RHEL
- Reduce our GCE/AWS usage
- Easier to switch git host (RE: CNCF)

Note: This setup does not do rpm builds, binaries are built from source
itself using Makefile. There's no clean and reliable way to fetch actual
RHEL spec files using packit, and CentOS Stream spec files can't be
depended on as they move at a faster pace and can be out of sync with
RHEL release spec files.

The lint test has been disabled for now.

Fixes: RUN-3105

Signed-off-by: Lokesh Mandvekar <[email protected]>
@lsm5 lsm5 force-pushed the release-1.39-tmt-rhel branch from be4501c to 5deada8 Compare June 16, 2025 18:38
Copy link
Collaborator

@flouthoc flouthoc left a comment

Choose a reason for hiding this comment

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

LGTM
/lgtm
/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 16, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, lsm5

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

@flouthoc
Copy link
Collaborator

/hold

@flouthoc
Copy link
Collaborator

@lsm5 [testing-farm:RHEL-9.6.0-Nightly-x86_64] is failing is this expected ?

@lsm5
Copy link
Member Author

lsm5 commented Jun 17, 2025

@lsm5 [testing-farm:RHEL-9.6.0-Nightly-x86_64] is failing is this expected ?

seems like a flake in gpg-agent. The test is passing now, but we're waiting on unit tests.

@lsm5
Copy link
Member Author

lsm5 commented Jun 17, 2025

passing now.

/hold cancel

@TomSweeneyRedHat
Copy link
Member

LGTM

@github-actions
Copy link

A friendly reminder that this PR had no activity for 30 days.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants