Skip to content

Commit fd3bfe4

Browse files
agullonagullon
committed
USHIFT-6743: revert scenario splits, move core-api tests to dedicated suite
Revert all presubmit/release scenario splitting back to original names. Split configuration scenarios into configuration1 (pre-existing tests: configuration.robot, show-config.robot, tls-configuration.robot) and configuration2 (new tests: apiserver-readiness, audit-log, data-dir, drop-in-config, kustomize-sources, logging). Configuration2 runs only in periodics and releases, not presubmits. Move clusterip-service, crd-validation, and scc-admission tests from suites/standard1/ to new suites/core-api/ suite, referenced from storage-telemetry-core-api and osconfig-lifecycle-core-api scenarios. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED
1 parent 95b1f2b commit fd3bfe4

39 files changed

Lines changed: 153 additions & 162 deletions

test/scenarios-bootc/el10/periodics/el102-src@osconfig-lifecycle.sh renamed to test/scenarios-bootc/el10/periodics/el102-src@configuration1.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ scenario_remove_vms() {
1212
}
1313

1414
scenario_run_tests() {
15-
run_tests host1 suites/osconfig/lifecycle.robot
15+
run_tests host1 suites/configuration1/
1616
}

‎test/scenarios-bootc/el10/periodics/el102-src@configuration2.sh‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
3+
# Sourced from scenario.sh and uses functions defined there.
4+
5+
scenario_create_vms() {
6+
prepare_kickstart host1 kickstart-bootc.ks.template rhel102-bootc-source
7+
launch_vm rhel102-bootc
8+
}
9+
10+
scenario_remove_vms() {
11+
remove_vm host1
12+
}
13+
14+
scenario_run_tests() {
15+
run_tests host1 \
16+
suites/configuration2/apiserver-readiness.robot \
17+
suites/configuration2/audit-log.robot \
18+
suites/configuration2/data-dir.robot \
19+
suites/configuration2/drop-in-config.robot \
20+
suites/configuration2/kustomize-sources.robot \
21+
suites/configuration2/logging.robot
22+
}

‎test/scenarios-bootc/el10/periodics/el102-src@osconfig-lifecycle-core-api.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
3+
# Sourced from scenario.sh and uses functions defined there.
4+
5+
scenario_create_vms() {
6+
prepare_kickstart host1 kickstart-bootc.ks.template rhel102-bootc-source
7+
launch_vm rhel102-bootc
8+
}
9+
10+
scenario_remove_vms() {
11+
remove_vm host1
12+
}
13+
14+
scenario_run_tests() {
15+
run_tests host1 \
16+
suites/osconfig/lifecycle.robot \
17+
suites/core-api/
18+
}

‎test/scenarios-bootc/el10/presubmits/el102-src@configuration1.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@ scenario_remove_vms() {
1212
}
1313

1414
scenario_run_tests() {
15-
run_tests host1 \
16-
suites/configuration/configuration.robot \
17-
suites/configuration/kustomize-sources.robot
15+
run_tests host1 suites/configuration1/
1816
}

‎test/scenarios-bootc/el10/presubmits/el102-src@configuration2.sh‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎test/scenarios-bootc/el10/releases/el102-lrel@dual-stack-configuration1.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ scenario_run_tests() {
2121
exit_if_image_not_found "${start_image}"
2222
run_tests host1 \
2323
suites/ipv6/dualstack.robot \
24-
suites/configuration/configuration.robot \
25-
suites/configuration/kustomize-sources.robot
24+
suites/configuration1/
2625
}

‎test/scenarios-bootc/el10/releases/el102-lrel@dual-stack-configuration2.sh‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ scenario_remove_vms() {
2020
scenario_run_tests() {
2121
exit_if_image_not_found "${start_image}"
2222
run_tests host1 \
23-
suites/configuration/tls-configuration.robot \
24-
suites/configuration/drop-in-config.robot \
25-
suites/configuration/show-config.robot \
26-
suites/configuration/logging.robot \
27-
suites/configuration/data-dir.robot \
28-
suites/configuration/apiserver-readiness.robot \
29-
suites/configuration/audit-log.robot
23+
suites/configuration2/apiserver-readiness.robot \
24+
suites/configuration2/audit-log.robot \
25+
suites/configuration2/data-dir.robot \
26+
suites/configuration2/drop-in-config.robot \
27+
suites/configuration2/kustomize-sources.robot \
28+
suites/configuration2/logging.robot
3029
}

test/scenarios-bootc/el10/releases/el102-lrel@storage-telemetry.sh renamed to test/scenarios-bootc/el10/releases/el102-lrel@storage-telemetry-core-api.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ scenario_run_tests() {
2525
--variable "PROXY_PORT:9001" \
2626
--variable "PROMETHEUS_HOST:$(hostname)" \
2727
suites/storage/ \
28-
suites/telemetry/telemetry.robot
28+
suites/telemetry/telemetry.robot \
29+
suites/core-api/
2930
}

test/scenarios-bootc/el9/periodics/el98-src@osconfig-lifecycle.sh renamed to test/scenarios-bootc/el9/periodics/el98-src@configuration1.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ scenario_remove_vms() {
1212
}
1313

1414
scenario_run_tests() {
15-
run_tests host1 suites/osconfig/lifecycle.robot
15+
run_tests host1 suites/configuration1/
1616
}

‎test/scenarios-bootc/el9/periodics/el98-src@configuration2.sh‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
3+
# Sourced from scenario.sh and uses functions defined there.
4+
5+
scenario_create_vms() {
6+
prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
7+
launch_vm rhel98-bootc
8+
}
9+
10+
scenario_remove_vms() {
11+
remove_vm host1
12+
}
13+
14+
scenario_run_tests() {
15+
run_tests host1 \
16+
suites/configuration2/apiserver-readiness.robot \
17+
suites/configuration2/audit-log.robot \
18+
suites/configuration2/data-dir.robot \
19+
suites/configuration2/drop-in-config.robot \
20+
suites/configuration2/kustomize-sources.robot \
21+
suites/configuration2/logging.robot
22+
}

0 commit comments

Comments
 (0)