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

feat: support RHEL 9 on s390x architecture #290

Merged
merged 1 commit into from
Nov 22, 2024
Merged

feat: support RHEL 9 on s390x architecture #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ rhel.9.arm64 | Red Hat Enterprise Linux 9 (arm64)
rhel.9.desktop | Red Hat Enterprise Linux 9 Desktop (amd64)
rhel.9.dpdk | Red Hat Enterprise Linux 9 DPDK (amd64)
rhel.9.realtime | Red Hat Enterprise Linux 9 Realtime (amd64)
rhel.9.s390x | Red Hat Enterprise Linux 9 (s390x)
sles | SUSE Linux Enterprise Server
ubuntu | Ubuntu
windows.10 | Microsoft Windows 10
Expand Down
1 change: 1 addition & 0 deletions preferences/rhel/9/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ kind: Kustomization
resources:
- ./arm64
- ./amd64
- ./s390x
14 changes: 14 additions & 0 deletions preferences/rhel/9/s390x/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- ../../base

components:
- ./metadata
- ./requirements
- ../../../components/disk-dedicatediothread
- ../../../components/rng

nameSuffix: ".9.s390x"
11 changes: 11 additions & 0 deletions preferences/rhel/9/s390x/metadata/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component

patches:
- path: ./metadata.yaml
target:
kind: VirtualMachinePreference
- path: ./metadata.yaml
target:
kind: VirtualMachineClusterPreference
9 changes: 9 additions & 0 deletions preferences/rhel/9/s390x/metadata/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
apiVersion: instancetype.kubevirt.io/v1beta1
kind: VirtualMachinePreference
metadata:
name: metadata
annotations:
openshift.io/display-name: "Red Hat Enterprise Linux 9 (s390x)"
labels:
instancetype.kubevirt.io/arch: "s390x"
11 changes: 11 additions & 0 deletions preferences/rhel/9/s390x/requirements/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component

patches:
- path: ./requirements.yaml
target:
kind: VirtualMachinePreference
- path: ./requirements.yaml
target:
kind: VirtualMachineClusterPreference
12 changes: 12 additions & 0 deletions preferences/rhel/9/s390x/requirements/requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
apiVersion: instancetype.kubevirt.io/v1beta1
kind: VirtualMachinePreference
metadata:
name: requirements
spec:
# https://access.redhat.com/articles/rhel-limits#minimum-required-memory-3
requirements:
cpu:
guest: 1
memory:
guest: 1.5Gi
3 changes: 2 additions & 1 deletion tests/functests/instancetype_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ var _ = Describe("Common instance types func tests", func() {
Entry("[test_id:10745] CentOS Stream 9", centosStream9ContainerDisk,
map[string]string{"amd64": "centos.stream9", "arm64": "centos.stream9", "s390x": "centos.stream9"},
[]testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("cloud-user")}),
Entry("[test_id:TODO] RHEL 9", rhel9ContainerDisk, map[string]string{"amd64": "rhel.9", "arm64": "rhel.9.arm64"},
Entry("[test_id:TODO] RHEL 9", rhel9ContainerDisk,
map[string]string{"amd64": "rhel.9", "arm64": "rhel.9.arm64", "s390x": "rhel.9.s390x"},
[]testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("cloud-user")}),
Entry("[test_id:TODO] RHEL 10", rhel10ContainerDisk, map[string]string{"amd64": "rhel.10", "arm64": "rhel.10.arm64"},
[]testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("cloud-user")}),
Expand Down