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 FreeBSD version parsing #5296

Merged
merged 1 commit into from Jan 29, 2024
Merged

Fix FreeBSD version parsing #5296

merged 1 commit into from Jan 29, 2024

Conversation

dfr
Copy link
Contributor

@dfr dfr commented Jan 27, 2024

It was generating an error when parsing "14.0-RELEASE-p4" due to a stupid bug when attempting to check that the version part only has two parts.

When I wrote this originally, I was using systems running either 13.2-STABLE or 14.0-CURRENT and didn't properly take into account the patchleve. This factors out the version parsing and adds a unit test.

What type of PR is this?

/kind bug

What this PR does / why we need it:

It forces Podman and Buildah to use two jails for each container instead of one when run on the latest iteration of FreeBSD 14.0

How to verify it

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

It was generating an error when parsing "14.0-RELEASE-p4" due to a
stupid bug when attempting to check that the version part only has two
parts.

Signed-off-by: Doug Rabson <dfr@rabson.org>
@openshift-ci openshift-ci bot added the kind/bug Categorizes issue or PR as related to a bug. label Jan 27, 2024
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
/hold

Copy link
Contributor

openshift-ci bot commented Jan 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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

rhatdan commented Jan 29, 2024

Test failure has nothing to do with this change so force merging to save the planet

@rhatdan rhatdan merged commit 06a5df8 into containers:main Jan 29, 2024
32 of 34 checks passed
@dfr dfr deleted the freebsd-version branch January 29, 2024 17:32
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 30, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved kind/bug Categorizes issue or PR as related to a bug. lgtm locked - please file new issue/PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants