Skip to content

USHIFT-7337: Make CentOS / RHEL optional scenarios consistent across OS versions and build types #7032

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

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

USHIFT-7337: Make CentOS / RHEL optional scenarios consistent across OS versions and build types #7032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
878685a
Add retries in DNS resolution test
ggiguash Jul 11, 2026
cf6bee8
Fix CentOS 9/10 optional scenarios
ggiguash Jul 11, 2026
bc8d028
All optional scenarios must have consistent execution and greenboot t…
ggiguash Jul 11, 2026
d7d7042
All optional scenarios must be in periodics or releases
ggiguash Jul 11, 2026
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
11 changes: 10 additions & 1 deletion test/scenarios-bootc/el10/periodics/el102-src@optional.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

# Sourced from scenario.sh and uses functions defined there.

# Each optional suite restarts MicroShift with its own kustomizePaths config,
# adding ~10 minutes of restart overhead to the total execution time.
# shellcheck disable=SC2034 # used elsewhere
TEST_EXECUTION_TIMEOUT=60m

# shellcheck disable=SC2034 # used elsewhere
# Increase greenboot timeout for optional packages (more services to start)
GREENBOOT_TIMEOUT=1200

# 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
Expand All @@ -15,7 +24,7 @@ scenario_create_vms() {
fi
LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template rhel102-bootc-source-optionals
# Three nics - one for sriov, one for macvlan, another for ipvlan (they cannot enslave the same interface)
launch_vm rhel102-bootc --network "${networks}" --vm_disksize 25
launch_vm rhel102-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4
}

scenario_remove_vms() {
Expand Down
9 changes: 9 additions & 0 deletions test/scenarios-bootc/el10/releases/el102-lrel@optional.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

# Sourced from scenario.sh and uses functions defined there.

# Each optional suite restarts MicroShift with its own kustomizePaths config,
# adding ~10 minutes of restart overhead to the total execution time.
# shellcheck disable=SC2034 # used elsewhere
TEST_EXECUTION_TIMEOUT=60m

# shellcheck disable=SC2034 # used elsewhere
# Increase greenboot timeout for optional packages (more services to start)
GREENBOOT_TIMEOUT=1200

# 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
Expand Down
0 ...bootc/el9/presubmits/el98-src@optional.sh → ...-bootc/el9/periodics/el98-src@optional.sh
View file
Open in desktop
File renamed without changes.
10 changes: 10 additions & 0 deletions test/scenarios-bootc/el9/releases/el98-lrel@optional.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

# Sourced from scenario.sh and uses functions defined there.

# Each optional suite restarts MicroShift with its own kustomizePaths config,
# adding ~10 minutes of restart overhead to the total execution time.
# shellcheck disable=SC2034 # used elsewhere
TEST_EXECUTION_TIMEOUT=60m

# shellcheck disable=SC2034 # used elsewhere
# Increase greenboot timeout for optional packages (more services to start)
GREENBOOT_TIMEOUT=1200

# 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
Expand All @@ -17,6 +26,7 @@ scenario_create_vms() {
if [[ "${UNAME_M}" =~ aarch64 ]]; then
networks="${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}"
fi

LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}"
# Three nics - one for sriov, one for macvlan, another for ipvlan (they cannot enslave the same interface)
launch_vm rhel98-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4
Expand Down
25 changes: 20 additions & 5 deletions test/scenarios-bootc/upstream/cos10-src@optional.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,30 @@

# Sourced from scenario.sh and uses functions defined there.

# Each optional suite restarts MicroShift with its own kustomizePaths config,
# adding ~10 minutes of restart overhead to the total execution time.
# shellcheck disable=SC2034 # used elsewhere
TEST_EXECUTION_TIMEOUT=60m

# shellcheck disable=SC2034 # used elsewhere
# Increase greenboot timeout for optional packages (more services to start)
GREENBOOT_TIMEOUT=1200

# 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() {
# Skip sriov network on ARM because the igb driver is not supported.
local networks="${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK},sriov"
if [[ "${UNAME_M}" =~ aarch64 ]]; then
networks="${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}"
fi

LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template cos10-bootc-source-optionals
# Two nics - one for macvlan, another for ipvlan (they cannot enslave the same interface)
launch_vm centos10-bootc --network "${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}" --vm_disksize 25
# Three nics - one for sriov, one for macvlan, another for ipvlan (they cannot enslave the same interface)
launch_vm centos10-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4
}

scenario_remove_vms() {
Expand All @@ -19,11 +34,11 @@ scenario_remove_vms() {

scenario_run_tests() {
local skip_args=""

skip_args="--skip sriov"
if [[ "${UNAME_M}" =~ aarch64 ]]; then
skip_args+=" --skip tls-scanner"
skip_args="--skip sriov --skip tls-scanner"
fi
# Skip generic device plugin on RHEL 10 until we can get the correct kernel-devel package.
skip_args+=" --skip generic-device-plugin"
# shellcheck disable=SC2086
run_tests host1 \
--variable "PROMETHEUS_HOST:$(hostname)" \
Expand Down
24 changes: 18 additions & 6 deletions test/scenarios-bootc/upstream/cos9-src@optional.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,40 @@

# Sourced from scenario.sh and uses functions defined there.

# Each optional suite restarts MicroShift with its own kustomizePaths config,
# adding ~10 minutes of restart overhead to the total execution time.
# shellcheck disable=SC2034 # used elsewhere
TEST_EXECUTION_TIMEOUT=60m

# shellcheck disable=SC2034 # used elsewhere
# Increase greenboot timeout for optional packages (more services to start)
GREENBOOT_TIMEOUT=1200

# 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() {
# Skip sriov network on ARM because the igb driver is not supported.
local networks="${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK},sriov"
if [[ "${UNAME_M}" =~ aarch64 ]]; then
networks="${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}"
fi

LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template cos9-bootc-source-optionals
# Two nics - one for macvlan, another for ipvlan (they cannot enslave the same interface)
launch_vm centos9-bootc --network "${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}" --vm_disksize 25
# Three nics - one for sriov, one for macvlan, another for ipvlan (they cannot enslave the same interface)
launch_vm centos9-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4
}

scenario_remove_vms() {
remove_vm host1
}


scenario_run_tests() {
local skip_args=""

skip_args="--skip sriov"
if [[ "${UNAME_M}" =~ aarch64 ]]; then
skip_args+=" --skip tls-scanner"
skip_args="--skip sriov --skip tls-scanner"
fi
# shellcheck disable=SC2086
run_tests host1 \
Expand Down
4 changes: 4 additions & 0 deletions test/scenarios/periodics/el98-src@optional.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
# shellcheck disable=SC2034 # used elsewhere
TEST_EXECUTION_TIMEOUT=60m

# shellcheck disable=SC2034 # used elsewhere
# Increase greenboot timeout for optional packages (more services to start)
GREENBOOT_TIMEOUT=1200

# 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
Expand Down
9 changes: 9 additions & 0 deletions test/scenarios/releases/el98-lrel@optional.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

# Sourced from scenario.sh and uses functions defined there.

# Each optional suite restarts MicroShift with its own kustomizePaths config,
# adding ~10 minutes of restart overhead to the total execution time.
# shellcheck disable=SC2034 # used elsewhere
TEST_EXECUTION_TIMEOUT=60m

# shellcheck disable=SC2034 # used elsewhere
# Increase greenboot timeout for optional packages (more services to start)
GREENBOOT_TIMEOUT=1200

# 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
Expand Down
17 changes: 14 additions & 3 deletions test/suites/configuration1/dns-resource-configuration.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,7 @@ Limit Less Than Request Prevents Start
DNS Resolution After Resource Change
[Documentation] Verify CoreDNS resolves cluster-local services after resource change
[Setup] Apply DNS Resource Config ${DNS_CUSTOM_RESOURCES}
${output}= Oc Exec router-default nslookup kubernetes.default.svc.cluster.local
... openshift-ingress deployment
Should Contain ${output} kubernetes.default.svc.cluster.local
DNS Should Resolve kubernetes.default.svc.cluster.local
[Teardown] Remove DNS Resource Config


Expand Down Expand Up @@ -182,6 +180,19 @@ Apply Invalid DNS Resource Config
VAR ${CURSOR}= ${cursor} scope=TEST
Run Keyword And Expect Error 0 != 1 Restart MicroShift

DNS Should Resolve
[Documentation] Wait for CoreDNS to resolve the given hostname
[Arguments] ${hostname}
Wait Until Keyword Succeeds 10x 5s
... DNS Lookup Should Succeed ${hostname}

DNS Lookup Should Succeed
[Documentation] Assert that CoreDNS resolves the given hostname
[Arguments] ${hostname}
${output}= Oc Exec router-default nslookup ${hostname}
... openshift-ingress deployment
Should Contain ${output} ${hostname}

Remove DNS Resource Config
[Documentation] Remove the DNS resource drop-in config and restart MicroShift
Remove Drop In MicroShift Config ${DNS_DROPIN}
Expand Down