-
Notifications
You must be signed in to change notification settings - Fork 230
USHIFT-6071: Add RF Test Suites: optional, osconfig and tuned into release scenarios #5386
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,6 +42,7 @@ ports = [ | |
| "443:tcp", | ||
| "5353:udp", | ||
| "6443:tcp", | ||
| "8889:tcp", | ||
| "30000-32767:tcp", | ||
| "30000-32767:udp", | ||
| ] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,6 +53,7 @@ ports = [ | |
| "443:tcp", | ||
| "5353:udp", | ||
| "6443:tcp", | ||
| "8889:tcp", | ||
| "30000-32767:tcp", | ||
| "30000-32767:udp", | ||
| ] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
125 changes: 125 additions & 0 deletions
125
test/image-blueprints/layer2-presubmit/group1/rhel96-lrel-optionals-tuned.toml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| {{- if env.Getenv "BREW_LREL_RELEASE_VERSION" "" -}} | ||
| {{- /* | ||
|
|
||
| We wrap this template in a test so that the body of the output is | ||
| empty when there is no "current" version release. The output file | ||
| must end up completely empty, so we need to remove whitespace from | ||
| around the first and last template instructions. | ||
|
|
||
| */ -}} | ||
|
|
||
| name = "rhel-9.6-microshift-brew-tuned-4.{{ .Env.MINOR_VERSION}}-{{ .Env.LATEST_RELEASE_TYPE}}" | ||
| description = "A RHEL 9.6 image with already built and released RPMs like EC, RC, or Z-stream release: {{ .Env.BREW_LREL_RELEASE_VERSION }}" | ||
| version = "0.0.1" | ||
| modules = [] | ||
| groups = [] | ||
| distro = "rhel-96" | ||
|
|
||
| # Parent specification directive recognized by test/bin/build_images.sh to be | ||
| # used with the '--parent' argument of 'osbuild-composer' | ||
| # parent = "rhel-9.6-microshift-brew-optionals-4.{{ .Env.PREVIOUS_MINOR_VERSION }}-zstream" | ||
|
|
||
| {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }} | ||
| [[packages]] | ||
| name = "{{ . }}" | ||
| version = "{{ env.Getenv "BREW_LREL_RELEASE_VERSION" }}" | ||
| {{ end }} | ||
|
|
||
| {{ range (env.Getenv "MICROSHIFT_OPTIONAL_RPMS" | strings.Split " ") }} | ||
| [[packages]] | ||
| name = "{{ . }}" | ||
| version = "{{ env.Getenv "BREW_LREL_RELEASE_VERSION" }}" | ||
| {{ end }} | ||
|
|
||
| {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} | ||
| {{ range (env.Getenv "MICROSHIFT_X86_64_RPMS" | strings.Split " ") }} | ||
| [[packages]] | ||
| name = "{{ . }}" | ||
| version = "{{ env.Getenv "BREW_LREL_RELEASE_VERSION" }}" | ||
| {{ end }} | ||
| {{- end }} | ||
|
|
||
| [[packages]] | ||
| name = "microshift-test-agent" | ||
| version = "*" | ||
|
|
||
| [[packages]] | ||
| name = "systemd-resolved" | ||
| version = "*" | ||
|
|
||
| {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} | ||
| # Kernel RT is only available for x86_64 | ||
| [customizations.kernel] | ||
| name = "kernel-rt" | ||
| {{- end }} | ||
|
|
||
| [customizations.services] | ||
| enabled = ["microshift-test-agent", "microshift", "microshift-tuned"] | ||
|
|
||
| [customizations.firewall] | ||
| ports = [ | ||
| "22:tcp", | ||
| "80:tcp", | ||
| "443:tcp", | ||
| "5353:udp", | ||
| "6443:tcp", | ||
| "8889:tcp", | ||
| "30000-32767:tcp", | ||
| "30000-32767:udp", | ||
| ] | ||
|
|
||
| [customizations.firewall.services] | ||
| enabled = ["mdns", "ssh", "http", "https"] | ||
|
|
||
| [[customizations.firewall.zones]] | ||
| name = "trusted" | ||
| sources = ["10.42.0.0/16", "169.254.169.1", "fd01::/48"] | ||
|
|
||
| [[customizations.files]] | ||
| path = "/etc/microshift/config.yaml" | ||
| data = """ | ||
| kubelet: | ||
| cpuManagerPolicy: static | ||
| cpuManagerPolicyOptions: | ||
| full-pcpus-only: "true" | ||
| cpuManagerReconcilePeriod: 5s | ||
| memoryManagerPolicy: Static | ||
| topologyManagerPolicy: single-numa-node | ||
| reservedSystemCPUs: 0-1 | ||
| reservedMemory: | ||
| - limits: | ||
| memory: 1100Mi | ||
| numaNode: 0 | ||
| kubeReserved: | ||
| memory: 500Mi | ||
| systemReserved: | ||
| memory: 500Mi | ||
| evictionHard: | ||
| imagefs.available: 15% | ||
| memory.available: 100Mi | ||
| nodefs.available: 10% | ||
| nodefs.inodesFree: 5% | ||
| evictionPressureTransitionPeriod: 0s | ||
| """ | ||
|
|
||
| [[customizations.files]] | ||
| path = "/etc/tuned/microshift-baseline-variables.conf" | ||
| data = """ | ||
| # Isolated cores should be complementary to kubelet's reserved CPUs. | ||
| # Isolated and reserved CPUs should contain all online CPUs. | ||
| # Core #3 is for testing offlining hence skipped. | ||
| isolated_cores=2,4-5 | ||
| hugepages_size=2M | ||
| hugepages=10 | ||
| additional_args=test1=on test2=true dummy | ||
| offline_cpu_set=3 | ||
| """ | ||
|
|
||
| [[customizations.files]] | ||
| path = "/etc/microshift/tuned.yaml" | ||
| data = """ | ||
| profile: microshift-baseline | ||
| reboot_after_apply: True | ||
| """ | ||
|
|
||
| {{- end -}} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Sourced from scenario.sh and uses functions defined there. | ||
|
|
||
| # Redefine network-related settings to use the dedicated network bridge | ||
| VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")" | ||
| # shellcheck disable=SC2034 # used elsewhere | ||
| WEB_SERVER_URL="http://${VM_BRIDGE_IP}:${WEB_SERVER_PORT}" | ||
|
|
||
| scenario_create_vms() { | ||
| prepare_kickstart host1 kickstart-bootc.ks.template "rhel96-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional" | ||
| # Two nics - one for macvlan, another for ipvlan (they cannot enslave the same interface) | ||
| launch_vm --boot_blueprint rhel96-bootc --network "${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}" | ||
| } | ||
|
|
||
| scenario_remove_vms() { | ||
| remove_vm host1 | ||
| } | ||
|
|
||
| scenario_run_tests() { | ||
| run_tests host1 \ | ||
| --variable "PROMETHEUS_HOST:$(hostname)" \ | ||
| --variable "PROMETHEUS_PORT:9092" \ | ||
| --variable "LOKI_HOST:$(hostname)" \ | ||
| --variable "LOKI_PORT:3200" \ | ||
| --variable "PROM_EXPORTER_PORT:8889" \ | ||
| suites/optional/ | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should not pull sources from a private repo - is there a public one?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think so, I was surprised by this, though. But I think Patryk did it this way because some custom changes are needed in
serialismrepo. This is the PR where Patryk add it for the first time.