Update env vars and network requirements for optional tests

Author: pacevedom

test/scenarios-bootc/el9/presubmits/el98-src@cert-manager.sh

@@ -23,7 +23,7 @@ dynamic_schedule_requirements() {
 min_vcpus=4
 min_memory=4096
 min_disksize=25
-networks="${NETWORKS}"
+networks=
 boot_image=rhel98-bootc-source-optionals
 fips=false
 slow=true
@@ -41,14 +41,5 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    local skip_args=""
-    if [[ "${UNAME_M}" =~ aarch64 ]]; then
-        skip_args="--skip sriov"
-    fi
-    # shellcheck disable=SC2086
-    run_tests host1 \
-        --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "LOKI_HOST:$(hostname)" \
-        ${skip_args} \
-        suites/optional/cert-manager.robot
+    run_tests host1 suites/optional/cert-manager.robot
 }

test/scenarios-bootc/el9/presubmits/el98-src@dns.sh

@@ -27,7 +27,6 @@ scenario_run_tests() {
     # The SYNC_FREQUENCY is set to a shorter-than-default value to speed up
     # pre-submit scenario completion time in DNS tests.
     run_tests host1 \
-        --variable "EXPECTED_OS_VERSION:9.8" \
         --variable "SYNC_FREQUENCY:5s" \
         suites/standard1/dns.robot
 }

test/scenarios-bootc/el9/presubmits/el98-src@gateway-api.sh

@@ -23,7 +23,7 @@ dynamic_schedule_requirements() {
 min_vcpus=4
 min_memory=4096
 min_disksize=25
-networks="${NETWORKS}"
+networks=
 boot_image=rhel98-bootc-source-optionals
 fips=false
 slow=true
@@ -41,14 +41,5 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    local skip_args=""
-    if [[ "${UNAME_M}" =~ aarch64 ]]; then
-        skip_args="--skip sriov"
-    fi
-    # shellcheck disable=SC2086
-    run_tests host1 \
-        --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "LOKI_HOST:$(hostname)" \
-        ${skip_args} \
-        suites/optional/gateway-api.robot
+    run_tests host1 suites/optional/gateway-api.robot
 }

test/scenarios-bootc/el9/presubmits/el98-src@generic-device-plugin.sh

@@ -23,7 +23,7 @@ dynamic_schedule_requirements() {
 min_vcpus=4
 min_memory=4096
 min_disksize=25
-networks="${NETWORKS}"
+networks=
 boot_image=rhel98-bootc-source-optionals
 fips=false
 slow=true
@@ -41,14 +41,5 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    local skip_args=""
-    if [[ "${UNAME_M}" =~ aarch64 ]]; then
-        skip_args="--skip sriov"
-    fi
-    # shellcheck disable=SC2086
-    run_tests host1 \
-        --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "LOKI_HOST:$(hostname)" \
-        ${skip_args} \
-        suites/optional/generic-device-plugin.robot
+    run_tests host1 suites/optional/generic-device-plugin.robot
 }

test/scenarios-bootc/el9/presubmits/el98-src@healthchecks-disabled-service.sh

@@ -23,7 +23,7 @@ dynamic_schedule_requirements() {
 min_vcpus=4
 min_memory=4096
 min_disksize=25
-networks="${NETWORKS}"
+networks=
 boot_image=rhel98-bootc-source-optionals
 fips=false
 EOF
@@ -40,14 +40,5 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    local skip_args=""
-    if [[ "${UNAME_M}" =~ aarch64 ]]; then
-        skip_args="--skip sriov"
-    fi
-    # shellcheck disable=SC2086
-    run_tests host1 \
-        --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "LOKI_HOST:$(hostname)" \
-        ${skip_args} \
-        suites/optional/healthchecks-disabled-service.robot
+    run_tests host1 suites/optional/healthchecks-disabled-service.robot
 }

test/scenarios-bootc/el9/presubmits/el98-src@multus.sh

@@ -40,14 +40,5 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    local skip_args=""
-    if [[ "${UNAME_M}" =~ aarch64 ]]; then
-        skip_args="--skip sriov"
-    fi
-    # shellcheck disable=SC2086
-    run_tests host1 \
-        --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "LOKI_HOST:$(hostname)" \
-        ${skip_args} \
-        suites/optional/multus.robot
+    run_tests host1 suites/optional/multus.robot
 }

test/scenarios-bootc/el9/presubmits/el98-src@observability.sh

@@ -23,7 +23,7 @@ dynamic_schedule_requirements() {
 min_vcpus=4
 min_memory=4096
 min_disksize=25
-networks="${NETWORKS}"
+networks=
 boot_image=rhel98-bootc-source-optionals
 fips=false
 EOF

test/scenarios-bootc/el9/presubmits/el98-src@olm.sh

@@ -23,7 +23,7 @@ dynamic_schedule_requirements() {
 min_vcpus=4
 min_memory=4096
 min_disksize=25
-networks="${NETWORKS}"
+networks=
 boot_image=rhel98-bootc-source-optionals
 fips=false
 slow=true
@@ -32,7 +32,6 @@ EOF
 
 scenario_create_vms() {
     LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source-optionals
-    # 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
 }
 
@@ -41,14 +40,5 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    local skip_args=""
-    if [[ "${UNAME_M}" =~ aarch64 ]]; then
-        skip_args="--skip sriov --skip tls-scanner"
-    fi
-    # shellcheck disable=SC2086
-    run_tests host1 \
-        --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "LOKI_HOST:$(hostname)" \
-        ${skip_args} \
-        suites/optional/olm.robot
+    run_tests host1 suites/optional/olm.robot
 }

test/scenarios-bootc/el9/presubmits/el98-src@optional.sh

@@ -46,8 +46,6 @@ scenario_run_tests() {
     fi
     # shellcheck disable=SC2086
     run_tests host1 \
-        --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "LOKI_HOST:$(hostname)" \
         ${skip_args} \
         suites/optional/sriov.robot
 }