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.

Sign up for GitHub

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

Jump to bottom

Remove patterns-base-fips from SLFO base containers #2062

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove patterns-base-fips from SLFO base containers #2062

wants to merge 2 commits into from
+18 −19

Conversation

dirkmueller
Copy link
Member

This is pulling crypto-policies and we have base-fips now instead.

dcermak pushed a commit that referenced this pull request Nov 26, 2024
Test build for #2062
6e1067b
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 26, 2024 •
edited
Loading

Created a staging project on OBS for 16.0: home:defolos:BCI:Staging:16.0:16.0-2062
Changes pushed to branch 16.0-2062 as commit ee9e96ac3b6c277955344f845cddb230741d3f03
Build succeeded ✅

Build Results

Repository images in home:defolos:BCI:Staging:16.0:16.0-2062 for x86_64: current state: published
Build results:

package name status build log
base-fips-image ⛔ excluded live log
base-image ✅ succeeded live log
gcc-14-image ⛔ excluded live log
init-image ⛔ excluded live log
kiwi-image ⛔ excluded live log
sle16-kernel-module-devel-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:16.0:16.0-2062 for aarch64: current state: published
Build results:

package name status build log
base-fips-image ⛔ excluded live log
base-image ✅ succeeded live log
gcc-14-image ⛔ excluded live log
init-image ⛔ excluded live log
kiwi-image ⛔ excluded live log
sle16-kernel-module-devel-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:16.0:16.0-2062 for s390x: current state: published
Build results:

package name status build log
base-fips-image ⛔ excluded live log
base-image ✅ succeeded live log
gcc-14-image ⛔ excluded live log
init-image ⛔ excluded live log
kiwi-image ⛔ excluded live log
sle16-kernel-module-devel-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:16.0:16.0-2062 for ppc64le: current state: published
Build results:

package name status build log
base-fips-image ⛔ excluded live log
base-image ✅ succeeded live log
gcc-14-image ⛔ excluded live log
init-image ⛔ excluded live log
kiwi-image ⛔ excluded live log
sle16-kernel-module-devel-image ⛔ excluded live log

Repository containerfile in home:defolos:BCI:Staging:16.0:16.0-2062 for x86_64: current state: published
Build results:

package name status build log
base-fips-image ✅ succeeded live log
base-image ⛔ excluded live log
gcc-14-image ✅ succeeded live log
init-image ✅ succeeded live log
kiwi-image ✅ succeeded live log
sle16-kernel-module-devel-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:16.0:16.0-2062 for aarch64: current state: published
Build results:

package name status build log
base-fips-image ✅ succeeded live log
base-image ⛔ excluded live log
gcc-14-image ✅ succeeded live log
init-image ✅ succeeded live log
kiwi-image ✅ succeeded live log
sle16-kernel-module-devel-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:16.0:16.0-2062 for s390x: current state: published
Build results:

package name status build log
base-fips-image ✅ succeeded live log
base-image ⛔ excluded live log
gcc-14-image ✅ succeeded live log
init-image ✅ succeeded live log
kiwi-image ✅ succeeded live log
sle16-kernel-module-devel-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:16.0:16.0-2062 for ppc64le: current state: published
Build results:

package name status build log
base-fips-image ✅ succeeded live log
base-image ⛔ excluded live log
gcc-14-image ✅ succeeded live log
init-image ✅ succeeded live log
kiwi-image ✅ succeeded live log
sle16-kernel-module-devel-image ✅ succeeded live log

Build succeeded ✅

To run BCI-tests against this PR, use the following command:

OS_VERSION=16.0 TARGET=custom BASEURL=registry.opensuse.org/home/defolos/bci/staging/16.0/16.0-2062/ tox -- -n auto
The following images can be pulled from the staging project:
  • registry.opensuse.org/home/defolos/bci/staging/16.0/16.0-2062/containerfile/bci/bci-base-fips:16.0
  • registry.opensuse.org/home/defolos/bci/staging/16.0/16.0-2062/containerfile/bci/bci-init:16.0
  • registry.opensuse.org/home/defolos/bci/staging/16.0/16.0-2062/containerfile/bci/bci-sle16-kernel-module-devel:16.0
  • registry.opensuse.org/home/defolos/bci/staging/16.0/16.0-2062/containerfile/bci/gcc:14
  • registry.opensuse.org/home/defolos/bci/staging/16.0/16.0-2062/containerfile/bci/kiwi:10
  • registry.opensuse.org/home/defolos/bci/staging/16.0/16.0-2062/images/bci/bci-base:16.0

@dirkmueller
Remove patterns-base-fips from SLFO base containers
dd416b5 
This is pulling crypto-policies and we have base-fips now instead.
dcermak pushed a commit that referenced this pull request Nov 26, 2024
Test build for #2062
6b85d67
dcermak pushed a commit that referenced this pull request Nov 26, 2024
Test build for #2062
e8bebcb
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 26, 2024 •
edited
Loading

Created a staging project on OBS for 7: home:defolos:BCI:Staging:SLE-15-SP7:7-2062
Changes pushed to branch 7-2062 as commit 51fc1ef3a5e82dccad9cd2402b6940a46a0a2f70
Build succeeded ✅

Build Results

Repository images in home:defolos:BCI:Staging:SLE-15-SP7:7-2062 for x86_64: current state: published
Build results:

package name status build log
base-fips-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:SLE-15-SP7:7-2062 for aarch64: current state: published
Build results:

package name status build log
base-fips-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:SLE-15-SP7:7-2062 for s390x: current state: published
Build results:

package name status build log
base-fips-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:SLE-15-SP7:7-2062 for ppc64le: current state: published
Build results:

package name status build log
base-fips-image ⛔ excluded live log

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP7:7-2062 for x86_64: current state: published
Build results:

package name status build log
base-fips-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP7:7-2062 for aarch64: current state: published
Build results:

package name status build log
base-fips-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP7:7-2062 for s390x: current state: published
Build results:

package name status build log
base-fips-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:SLE-15-SP7:7-2062 for ppc64le: current state: published
Build results:

package name status build log
base-fips-image ✅ succeeded live log

Build succeeded ✅

To run BCI-tests against this PR, use the following command:

OS_VERSION=15.7 TARGET=custom BASEURL=registry.opensuse.org/home/defolos/bci/staging/sle-15-sp7/7-2062/ tox -- -n auto
The following images can be pulled from the staging project:
  • registry.opensuse.org/home/defolos/bci/staging/sle-15-sp7/7-2062/containerfile/bci/bci-base-fips:15.7

msmeissn
msmeissn reviewed Nov 26, 2024
View reviewed changes
Copy link
Contributor

@msmeissn msmeissn left a comment

Choose a reason for hiding this comment

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

okay

dcermak
dcermak reviewed Nov 26, 2024
View reviewed changes
src/bci_build/package/basecontainers.py Outdated
Comment on lines 144 to 156
match os_version:
case OsVersion.SP3:
return f"{os_version.pretty_os_version_no_dash} FIPS-140-2"
case OsVersion.SP4 | OsVersion.SP5 | OsVersion.SP6:
case (
OsVersion.SP4
| OsVersion.SP5
| OsVersion.SP6
| OsVersion.SP7
| OsVersion.SLE16_0
):
return f"{os_version.pretty_os_version_no_dash} FIPS-140-3"
case _:
raise NotImplementedError(f"Unsupported os_version: {os_version}")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Wouldn't this be a bit simpler:

def _get_fips_pretty_name(os_version: OsVersion) -> str:
    if os_version == OsVersion.SP3:
        return f"{os_version.pretty_os_version_no_dash} FIPS-140-2"
    if os_version.is_sle15 or os_version.is_slfo:
        return f"{os_version.pretty_os_version_no_dash} FIPS-140-3"

    raise NotImplementedError(f"Unsupported os_version: {os_version}")

Copy link
Member Author

Choose a reason for hiding this comment

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

yes, we can do that.

dcermak pushed a commit that referenced this pull request Nov 26, 2024
Test build for #2062
20136ba
dcermak pushed a commit that referenced this pull request Nov 26, 2024
Test build for #2062
4acaa17
dcermak pushed a commit that referenced this pull request Nov 26, 2024
Test build for #2062
ee9e96a
dcermak pushed a commit that referenced this pull request Nov 26, 2024
Test build for #2062
b6bd12d
dcermak pushed a commit that referenced this pull request Nov 26, 2024
Test build for #2062
51fc1ef
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 26, 2024 •
edited
Loading

Created a staging project on OBS for Tumbleweed: home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-2062
Changes pushed to branch Tumbleweed-2062 as commit b6bd12deb8d326cee7dc1dfde18a3f562e08eb5f
Build succeeded ✅

Build Results

Repository images in home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-2062 for x86_64: current state: published
Build results:

package name status build log
base-fips-image ⛔ excluded live log

Repository images in home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-2062 for aarch64: current state: published
Build results:

package name status build log
base-fips-image ⛔ excluded live log

Repository containerfile in home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-2062 for x86_64: current state: published
Build results:

package name status build log
base-fips-image ✅ succeeded live log

Repository containerfile in home:defolos:BCI:Staging:Tumbleweed:Tumbleweed-2062 for aarch64: current state: published
Build results:

package name status build log
base-fips-image ✅ succeeded live log

Build succeeded ✅

To run BCI-tests against this PR, use the following command:

OS_VERSION=tumbleweed TARGET=custom BASEURL=registry.opensuse.org/home/defolos/bci/staging/tumbleweed/tumbleweed-2062/ tox -- -n auto
The following images can be pulled from the staging project:
  • registry.opensuse.org/home/defolos/bci/staging/tumbleweed/tumbleweed-2062/containerfile/opensuse/bci/bci-base-fips:latest

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

@dcermak dcermak dcermak left review comments

@msmeissn msmeissn msmeissn left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dirkmueller @msmeissn @dcermak