From e14630d1b96f67ca0903450b22a0ee29cb43583e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Mon, 22 Sep 2025 13:05:26 +0200 Subject: [PATCH 1/2] manual cherrypick from #5386 PR --- test/bin/common_versions.sh | 5 +- test/bin/scenario.sh | 2 + ...-bootc-brew-y2-with-optional.containerfile | 1 + ...-bootc-brew-ec-with-optional.containerfile | 1 + ...c-brew-nightly-with-optional.containerfile | 1 + ...-bootc-brew-rc-with-optional.containerfile | 1 + ...-bootc-brew-y1-with-optional.containerfile | 1 + ...c-brew-zstream-with-optional.containerfile | 1 + .../group2/rhel94-brew-y2-with-optionals.toml | 1 + .../group3/rhel96-brew-y1-with-optionals.toml | 1 + .../group4/rhel96-brew-ec-with-optionals.toml | 5 + .../rhel96-brew-nightly-with-optionals.toml | 5 + .../group4/rhel96-brew-rc-with-optionals.toml | 5 + .../rhel96-brew-zstream-with-optionals.toml | 5 + .../group1/rhel96-lrel-optional-tuned.toml | 125 ++++++++++++++++++ .../releases/el96-lrel@optional.sh | 28 ++++ .../releases/el96-lrel@osconfig.sh | 18 +++ .../presubmits/el96-src@low-latency.sh | 2 +- .../releases/el96-lrel@low-latency.sh | 42 ++++++ test/scenarios/releases/el96-lrel@optional.sh | 36 +++++ test/scenarios/releases/el96-lrel@osconfig.sh | 18 +++ 21 files changed, 302 insertions(+), 2 deletions(-) create mode 100644 test/image-blueprints/layer2-presubmit/group1/rhel96-lrel-optional-tuned.toml create mode 100644 test/scenarios-bootc/releases/el96-lrel@optional.sh create mode 100644 test/scenarios-bootc/releases/el96-lrel@osconfig.sh create mode 100644 test/scenarios/releases/el96-lrel@low-latency.sh create mode 100644 test/scenarios/releases/el96-lrel@optional.sh create mode 100644 test/scenarios/releases/el96-lrel@osconfig.sh diff --git a/test/bin/common_versions.sh b/test/bin/common_versions.sh index fe628648fa..97bcd02c5b 100644 --- a/test/bin/common_versions.sh +++ b/test/bin/common_versions.sh @@ -138,5 +138,8 @@ export BREW_EC_RELEASE_VERSION export BREW_NIGHTLY_RELEASE_VERSION # Set the release type to ec, rc or zstream -LATEST_RELEASE_TYPE="ec" +LATEST_RELEASE_TYPE="rc" export LATEST_RELEASE_TYPE + +BREW_LREL_RELEASE_VERSION="${BREW_EC_RELEASE_VERSION}" +export BREW_LREL_RELEASE_VERSION diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh index 46ac1ff4b8..66b27d3056 100755 --- a/test/bin/scenario.sh +++ b/test/bin/scenario.sh @@ -31,6 +31,7 @@ SKIP_GREENBOOT=${SKIP_GREENBOOT:-false} # may be overridden in scenario file IMAGE_SIGSTORE_ENABLED=false # may be overridden in scenario file VNC_CONSOLE=${VNC_CONSOLE:-false} # may be overridden in global settings file TEST_RANDOMIZATION="all" # may be overridden in scenario file +TEST_EXCLUDES="none" # may be overridden in scenario file TEST_EXECUTION_TIMEOUT="30m" # may be overriden in scenario file SUBSCRIPTION_MANAGER_PLUGIN="${SUBSCRIPTION_MANAGER_PLUGIN:-${SCRIPTDIR}/subscription_manager_register.sh}" # may be overridden in global settings file RUN_HOST_OVERRIDE="" # target any given VM for running scenarios @@ -1064,6 +1065,7 @@ EOF if ! ${timeout_robot} \ --name "${SCENARIO}" \ --randomize "${TEST_RANDOMIZATION}" \ + --exclude "${TEST_EXCLUDES}" \ --loglevel TRACE \ --listener "${TESTDIR}/resources/sos-on-failure-listener.py" \ --pythonpath "${TESTDIR}/resources" \ diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-brew-y2-with-optional.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-brew-y2-with-optional.containerfile index d11e489630..74f2bf006e 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-brew-y2-with-optional.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-brew-y2-with-optional.containerfile @@ -38,6 +38,7 @@ RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \ firewall-offline-cmd --zone=public --add-port=443/tcp && \ firewall-offline-cmd --zone=public --add-port=5353/udp && \ firewall-offline-cmd --zone=public --add-port=6443/tcp && \ + firewall-offline-cmd --zone=public --add-port=8889/tcp && \ firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \ firewall-offline-cmd --zone=public --add-port=30000-32767/udp # {{- end -}} diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-ec-with-optional.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-ec-with-optional.containerfile index 3057117fd9..81d55eb87f 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-ec-with-optional.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-ec-with-optional.containerfile @@ -43,6 +43,7 @@ RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \ firewall-offline-cmd --zone=public --add-port=443/tcp && \ firewall-offline-cmd --zone=public --add-port=5353/udp && \ firewall-offline-cmd --zone=public --add-port=6443/tcp && \ + firewall-offline-cmd --zone=public --add-port=8889/tcp && \ firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \ firewall-offline-cmd --zone=public --add-port=30000-32767/udp diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-nightly-with-optional.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-nightly-with-optional.containerfile index f3be4374d2..16105fe192 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-nightly-with-optional.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-nightly-with-optional.containerfile @@ -43,6 +43,7 @@ RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \ firewall-offline-cmd --zone=public --add-port=443/tcp && \ firewall-offline-cmd --zone=public --add-port=5353/udp && \ firewall-offline-cmd --zone=public --add-port=6443/tcp && \ + firewall-offline-cmd --zone=public --add-port=8889/tcp && \ firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \ firewall-offline-cmd --zone=public --add-port=30000-32767/udp diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-rc-with-optional.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-rc-with-optional.containerfile index 8a88fd591a..0245563e7c 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-rc-with-optional.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-rc-with-optional.containerfile @@ -43,6 +43,7 @@ RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \ firewall-offline-cmd --zone=public --add-port=443/tcp && \ firewall-offline-cmd --zone=public --add-port=5353/udp && \ firewall-offline-cmd --zone=public --add-port=6443/tcp && \ + firewall-offline-cmd --zone=public --add-port=8889/tcp && \ firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \ firewall-offline-cmd --zone=public --add-port=30000-32767/udp diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-y1-with-optional.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-y1-with-optional.containerfile index edb1e43b9a..6461a928e8 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-y1-with-optional.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-y1-with-optional.containerfile @@ -43,6 +43,7 @@ RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \ firewall-offline-cmd --zone=public --add-port=443/tcp && \ firewall-offline-cmd --zone=public --add-port=5353/udp && \ firewall-offline-cmd --zone=public --add-port=6443/tcp && \ + firewall-offline-cmd --zone=public --add-port=8889/tcp && \ firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \ firewall-offline-cmd --zone=public --add-port=30000-32767/udp # {{- end -}} diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-zstream-with-optional.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-zstream-with-optional.containerfile index e47e20637c..96915bdd79 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-zstream-with-optional.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-brew-zstream-with-optional.containerfile @@ -43,6 +43,7 @@ RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \ firewall-offline-cmd --zone=public --add-port=443/tcp && \ firewall-offline-cmd --zone=public --add-port=5353/udp && \ firewall-offline-cmd --zone=public --add-port=6443/tcp && \ + firewall-offline-cmd --zone=public --add-port=8889/tcp && \ firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \ firewall-offline-cmd --zone=public --add-port=30000-32767/udp diff --git a/test/image-blueprints/layer1-base/group2/rhel94-brew-y2-with-optionals.toml b/test/image-blueprints/layer1-base/group2/rhel94-brew-y2-with-optionals.toml index 072472bb6d..e041e88c14 100644 --- a/test/image-blueprints/layer1-base/group2/rhel94-brew-y2-with-optionals.toml +++ b/test/image-blueprints/layer1-base/group2/rhel94-brew-y2-with-optionals.toml @@ -42,6 +42,7 @@ ports = [ "443:tcp", "5353:udp", "6443:tcp", + "8889:tcp", "30000-32767:tcp", "30000-32767:udp", ] diff --git a/test/image-blueprints/layer1-base/group3/rhel96-brew-y1-with-optionals.toml b/test/image-blueprints/layer1-base/group3/rhel96-brew-y1-with-optionals.toml index 25a2851c29..1da4ec8752 100644 --- a/test/image-blueprints/layer1-base/group3/rhel96-brew-y1-with-optionals.toml +++ b/test/image-blueprints/layer1-base/group3/rhel96-brew-y1-with-optionals.toml @@ -53,6 +53,7 @@ ports = [ "443:tcp", "5353:udp", "6443:tcp", + "8889:tcp", "30000-32767:tcp", "30000-32767:udp", ] diff --git a/test/image-blueprints/layer1-base/group4/rhel96-brew-ec-with-optionals.toml b/test/image-blueprints/layer1-base/group4/rhel96-brew-ec-with-optionals.toml index 5f08416eb8..64f742feed 100644 --- a/test/image-blueprints/layer1-base/group4/rhel96-brew-ec-with-optionals.toml +++ b/test/image-blueprints/layer1-base/group4/rhel96-brew-ec-with-optionals.toml @@ -43,6 +43,10 @@ version = "{{ env.Getenv "BREW_EC_RELEASE_VERSION" }}" name = "microshift-test-agent" version = "*" +[[packages]] +name = "systemd-resolved" +version = "*" + [customizations.services] enabled = ["microshift", "microshift-test-agent"] @@ -53,6 +57,7 @@ ports = [ "443:tcp", "5353:udp", "6443:tcp", + "8889:tcp", "30000-32767:tcp", "30000-32767:udp", ] diff --git a/test/image-blueprints/layer1-base/group4/rhel96-brew-nightly-with-optionals.toml b/test/image-blueprints/layer1-base/group4/rhel96-brew-nightly-with-optionals.toml index 15369ebb33..7496a41daa 100644 --- a/test/image-blueprints/layer1-base/group4/rhel96-brew-nightly-with-optionals.toml +++ b/test/image-blueprints/layer1-base/group4/rhel96-brew-nightly-with-optionals.toml @@ -43,6 +43,10 @@ version = "{{ env.Getenv "BREW_NIGHTLY_RELEASE_VERSION" }}" name = "microshift-test-agent" version = "*" +[[packages]] +name = "systemd-resolved" +version = "*" + [customizations.services] enabled = ["microshift", "microshift-test-agent"] @@ -53,6 +57,7 @@ ports = [ "443:tcp", "5353:udp", "6443:tcp", + "8889:tcp", "30000-32767:tcp", "30000-32767:udp", ] diff --git a/test/image-blueprints/layer1-base/group4/rhel96-brew-rc-with-optionals.toml b/test/image-blueprints/layer1-base/group4/rhel96-brew-rc-with-optionals.toml index 2160a33f50..932b3c5a1c 100644 --- a/test/image-blueprints/layer1-base/group4/rhel96-brew-rc-with-optionals.toml +++ b/test/image-blueprints/layer1-base/group4/rhel96-brew-rc-with-optionals.toml @@ -43,6 +43,10 @@ version = "{{ env.Getenv "BREW_RC_RELEASE_VERSION" }}" name = "microshift-test-agent" version = "*" +[[packages]] +name = "systemd-resolved" +version = "*" + [customizations.services] enabled = ["microshift", "microshift-test-agent"] @@ -53,6 +57,7 @@ ports = [ "443:tcp", "5353:udp", "6443:tcp", + "8889:tcp", "30000-32767:tcp", "30000-32767:udp", ] diff --git a/test/image-blueprints/layer1-base/group4/rhel96-brew-zstream-with-optionals.toml b/test/image-blueprints/layer1-base/group4/rhel96-brew-zstream-with-optionals.toml index 5b60a6eb22..603f538a72 100644 --- a/test/image-blueprints/layer1-base/group4/rhel96-brew-zstream-with-optionals.toml +++ b/test/image-blueprints/layer1-base/group4/rhel96-brew-zstream-with-optionals.toml @@ -43,6 +43,10 @@ version = "{{ env.Getenv "BREW_Y0_RELEASE_VERSION" }}" name = "microshift-test-agent" version = "*" +[[packages]] +name = "systemd-resolved" +version = "*" + [customizations.services] enabled = ["microshift", "microshift-test-agent"] @@ -53,6 +57,7 @@ ports = [ "443:tcp", "5353:udp", "6443:tcp", + "8889:tcp", "30000-32767:tcp", "30000-32767:udp", ] diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel96-lrel-optional-tuned.toml b/test/image-blueprints/layer2-presubmit/group1/rhel96-lrel-optional-tuned.toml new file mode 100644 index 0000000000..9cba09bc4b --- /dev/null +++ b/test/image-blueprints/layer2-presubmit/group1/rhel96-lrel-optional-tuned.toml @@ -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 -}} diff --git a/test/scenarios-bootc/releases/el96-lrel@optional.sh b/test/scenarios-bootc/releases/el96-lrel@optional.sh new file mode 100644 index 0000000000..6bc601136a --- /dev/null +++ b/test/scenarios-bootc/releases/el96-lrel@optional.sh @@ -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/ +} diff --git a/test/scenarios-bootc/releases/el96-lrel@osconfig.sh b/test/scenarios-bootc/releases/el96-lrel@osconfig.sh new file mode 100644 index 0000000000..2faa3e542b --- /dev/null +++ b/test/scenarios-bootc/releases/el96-lrel@osconfig.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +# Sourced from scenario.sh and uses functions defined there. + +scenario_create_vms() { + prepare_kickstart host1 kickstart-bootc.ks.template "rhel96-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional" + launch_vm --boot_blueprint rhel96-bootc +} + +scenario_remove_vms() { + remove_vm host1 +} + +scenario_run_tests() { + run_tests host1 \ + suites/osconfig/clusterid.robot \ + suites/osconfig/systemd-resolved.robot +} diff --git a/test/scenarios/presubmits/el96-src@low-latency.sh b/test/scenarios/presubmits/el96-src@low-latency.sh index 7b1a1a202a..0e23cf79ab 100644 --- a/test/scenarios/presubmits/el96-src@low-latency.sh +++ b/test/scenarios/presubmits/el96-src@low-latency.sh @@ -15,7 +15,7 @@ scenario_remove_vms() { } scenario_run_tests() { - # Should not be ran immediately after creating VM because of + # Should not be run immediately after creating VM because of # microshift-tuned rebooting the node to activate the profile. local -r start_time=$(date +%s) while true; do diff --git a/test/scenarios/releases/el96-lrel@low-latency.sh b/test/scenarios/releases/el96-lrel@low-latency.sh new file mode 100644 index 0000000000..0f3a5b8e7e --- /dev/null +++ b/test/scenarios/releases/el96-lrel@low-latency.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +export SKIP_GREENBOOT=true +export TEST_RANDOMIZATION=none + +# Sourced from scenario.sh and uses functions defined there. + +scenario_create_vms() { + prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-brew-tuned-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}" + launch_vm --vm_vcpus 6 +} + +scenario_remove_vms() { + remove_vm host1 +} + +scenario_run_tests() { + # Should not be run immediately after creating VM because of + # microshift-tuned rebooting the node to activate the profile. + local -r start_time=$(date +%s) + while true; do + boot_num=$(run_command_on_vm host1 "sudo journalctl --list-boots --quiet | wc -l" || true) + boot_num="${boot_num%$'\r'*}" + if [[ "${boot_num}" -ge 2 ]]; then + break + fi + if [ $(( $(date +%s) - start_time )) -gt 60 ]; then + echo "Timed out waiting for VM having 2 boots" + exit 1 + fi + sleep 5 + done + + # --exitonfailure because tests within suites are meant to be ordered, + # so don't advance to next test if current failed. + + run_tests host1 \ + --exitonfailure \ + suites/tuned/profile.robot \ + suites/tuned/microshift-tuned.robot \ + suites/tuned/workload-partitioning.robot +} diff --git a/test/scenarios/releases/el96-lrel@optional.sh b/test/scenarios/releases/el96-lrel@optional.sh new file mode 100644 index 0000000000..1eef1773d6 --- /dev/null +++ b/test/scenarios/releases/el96-lrel@optional.sh @@ -0,0 +1,36 @@ +#!/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.ks.template "rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}" + # Two nics - one for macvlan, another for ipvlan (they cannot enslave the same interface) + launch_vm --network "${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}" +} + +scenario_remove_vms() { + remove_vm host1 +} + +scenario_run_tests() { + # Generic Device Plugin suite is excluded because getting serialsim for ostree would require: + # - getting the version of the kernel of ostree image, + # - installing kernel-devel of that version on the hypervisor, + # - building serialsim + # - packaging serialsim as an RPM + # - including the RPM in the ostree blueprint + # GDP suite is tested with bootc images instead. + run_tests host1 \ + --variable "PROMETHEUS_HOST:$(hostname)" \ + --variable "PROMETHEUS_PORT:9092" \ + --variable "LOKI_HOST:$(hostname)" \ + --variable "LOKI_PORT:3200" \ + --variable "PROM_EXPORTER_PORT:8889" \ + --exclude generic-device-plugin \ + suites/optional/ +} diff --git a/test/scenarios/releases/el96-lrel@osconfig.sh b/test/scenarios/releases/el96-lrel@osconfig.sh new file mode 100644 index 0000000000..d084405a59 --- /dev/null +++ b/test/scenarios/releases/el96-lrel@osconfig.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +# Sourced from scenario.sh and uses functions defined there. + +scenario_create_vms() { + prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}" + launch_vm +} + +scenario_remove_vms() { + remove_vm host1 +} + +scenario_run_tests() { + run_tests host1 \ + suites/osconfig/clusterid.robot \ + suites/osconfig/systemd-resolved.robot +} From 351e79ef7626a920c63082026cf8aae724f9ffc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gull=C3=B3n?= Date: Mon, 22 Sep 2025 13:52:23 +0200 Subject: [PATCH 2/2] temp S3 bucket for testing --- test/bin/manage_build_cache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bin/manage_build_cache.sh b/test/bin/manage_build_cache.sh index eeb88378ac..73b7f7418b 100755 --- a/test/bin/manage_build_cache.sh +++ b/test/bin/manage_build_cache.sh @@ -7,7 +7,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # shellcheck source=test/bin/common.sh source "${SCRIPTDIR}/common.sh" -AWS_BUCKET_NAME="${AWS_BUCKET_NAME:-microshift-build-cache}" +AWS_BUCKET_NAME="microshift-ushift-6155-cache-us-west-2" BCH_SUBDIR= TAG_SUBDIR=