Skip to content

USHIFT-6156: Enable fips support for release scenarios#5513

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
kasturinarra:USHIFT-6156
Oct 8, 2025
Merged

USHIFT-6156: Enable fips support for release scenarios#5513
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
kasturinarra:USHIFT-6156

Conversation

@kasturinarra
Copy link
Contributor

@kasturinarra kasturinarra commented Sep 23, 2025 •
edited by openshift-ci bot
Loading

Which issue(s) this PR addresses: Enable fips support for release scenarios

Closes #USHIFT-6156

@openshift-ci openshift-ci bot requested review from eslutsky and ggiguash September 23, 2025 12:01
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 23, 2025
@kasturinarra kasturinarra changed the title Enable fips support for release scenarios USHIFT-6156: Enable fips support for release scenarios Sep 23, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 23, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 23, 2025 •
edited by openshift-ci bot
Loading

@kasturinarra: This pull request references USHIFT-6156 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Which issue(s) this PR addresses: Enable fips support for release scenarios

Closes #USHIFT-6156

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@kasturinarra
Copy link
Contributor Author

kasturinarra commented Sep 23, 2025

@agullon could you please help review ? thanks !!

@kasturinarra kasturinarra force-pushed the USHIFT-6156 branch 3 times, most recently from 9df4071 to a69c477 Compare September 25, 2025 07:58
@kasturinarra
Copy link
Contributor Author

kasturinarra commented Sep 25, 2025

/retest

1 similar comment
@kasturinarra
Copy link
Contributor Author

kasturinarra commented Sep 29, 2025

/retest

@kasturinarra kasturinarra force-pushed the USHIFT-6156 branch 2 times, most recently from 04d847c to 93954f2 Compare October 6, 2025 11:07
@kasturinarra
Copy link
Contributor Author

kasturinarra commented Oct 6, 2025

/test e2e-aws-tests

@kasturinarra
Copy link
Contributor Author

kasturinarra commented Oct 6, 2025

/test e2e-aws-tests-bootc-release-arm

agullon
agullon reviewed Oct 6, 2025
View reviewed changes
agullon
agullon reviewed Oct 6, 2025
View reviewed changes
agullon
agullon reviewed Oct 6, 2025
View reviewed changes
agullon
agullon reviewed Oct 6, 2025
View reviewed changes
agullon
agullon reviewed Oct 6, 2025
View reviewed changes
ggiguash
ggiguash suggested changes Oct 7, 2025
View reviewed changes
@kasturinarra
Copy link
Contributor Author

kasturinarra commented Oct 7, 2025

/test e2e-aws-tests-release-arm

@kasturinarra
Copy link
Contributor Author

kasturinarra commented Oct 7, 2025

/test e2e-aws-tests-bootc-release-arm

@agullon
Copy link
Contributor

agullon commented Oct 8, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 8, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 8, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agullon, kasturinarra

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [agullon,kasturinarra]

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

@kasturinarra
Copy link
Contributor Author

kasturinarra commented Oct 8, 2025

/verified by ci

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Oct 8, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 8, 2025

@kasturinarra: This PR has been marked as verified by ci.

Details

In response to this:

/verified by ci

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 8, 2025

@kasturinarra: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 6c9875b into openshift:main Oct 8, 2025
13 checks passed
@kasturinarra
Copy link
Contributor Author

kasturinarra commented Oct 8, 2025

/cherry-pick release-4.20

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 8, 2025

@kasturinarra: new pull request created: #5577

Details

In response to this:

/cherry-pick release-4.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Oct 8, 2025
Closed
agullon
agullon reviewed Oct 8, 2025
View reviewed changes
test/image-blueprints/layer1-base/group5/rhel96-brew-ec-with-optionals-fips.toml
@@ -0,0 +1,32 @@
{{- if and (env.Getenv "BREW_EC_RELEASE_VERSION" "") (env.Getenv "BREW_Y1_RELEASE_VERSION" "") -}}
Copy link
Contributor

@agullon agullon Oct 8, 2025

Choose a reason for hiding this comment

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

We don't need the BREW_Y1_RELEASE_VERSION check here because it's not used in this toml file

agullon
agullon reviewed Oct 8, 2025
View reviewed changes
test/image-blueprints/layer1-base/group5/rhel96-brew-ec-with-optionals-fips.toml
distro = "rhel-96"

# Use the base brewery blueprint as parent
parent = "rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-ec"
Copy link
Contributor

@agullon agullon Oct 8, 2025

Choose a reason for hiding this comment

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

We need to check if this parent exists in the first line of this file

agullon
agullon reviewed Oct 8, 2025
View reviewed changes
...ge-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-ec-with-optional-fips.containerfile
@@ -0,0 +1,16 @@
# {{- if env.Getenv "BREW_EC_RELEASE_VERSION" "" -}}
Copy link
Contributor

@agullon agullon Oct 8, 2025

Choose a reason for hiding this comment

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

this is checking if EC BREW RPMs exist, but we don't need this check because these RPMs are not needed to build this containerfile

instead, we need to check if the parent image exist

@kasturinarra kasturinarra mentioned this pull request Oct 9, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@eslutsky eslutsky Awaiting requested review from eslutsky

2 more reviewers

@agullon agullon agullon left review comments

@ggiguash ggiguash ggiguash requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

@agullon agullon

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@kasturinarra @openshift-ci-robot @agullon @openshift-cherrypick-robot @ggiguash