Skip to content

Commit 70dab4a

Browse files
Merge pull request #5053 from ggiguash/rhel96-upgrade-scenarios
USHIFT-5817: RHEL 9.6 upgrade scenarios
2 parents 30081c8 + 59b9392 commit 70dab4a

File tree

5 files changed

+37
-23
lines changed

5 files changed

+37
-23
lines changed

test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-prel.containerfile renamed to test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc-prel.containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM localhost/rhel94-test-agent:latest
1+
FROM localhost/rhel96-test-agent:latest
22

33
# Copy repository configuration
44
COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-prel.repo ./bootc-images/microshift-rhocp-y1.repo \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ scenario_create_vms() {
99
echo "Image '${dest_image}' not found - skipping test"
1010
return 0
1111
fi
12-
prepare_kickstart host1 kickstart-bootc.ks.template rhel94-bootc-prel
12+
prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-prel
1313
launch_vm --boot_blueprint rhel94-bootc
1414
}
1515

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Sourced from scenario.sh and uses functions defined there.
44

55
scenario_create_vms() {
6-
prepare_kickstart host1 kickstart-bootc.ks.template rhel94-bootc-prel
7-
launch_vm --boot_blueprint rhel94-bootc
6+
prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-prel
7+
launch_vm --boot_blueprint rhel96-bootc
88
}
99

1010
scenario_remove_vms() {

test/scenarios-bootc/presubmits/el94-prel@[email protected]

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#!/bin/bash
2+
3+
# Sourced from scenario.sh and uses functions defined there.
4+
5+
start_image=rhel96-bootc-prel
6+
7+
scenario_create_vms() {
8+
if ! does_image_exist "${start_image}"; then
9+
echo "Image '${start_image}' not found - skipping test"
10+
return 0
11+
fi
12+
prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}"
13+
launch_vm --boot_blueprint rhel96-bootc
14+
}
15+
16+
scenario_remove_vms() {
17+
if ! does_image_exist "${start_image}"; then
18+
echo "Image '${start_image}' not found - skipping test"
19+
return 0
20+
fi
21+
remove_vm host1
22+
}
23+
24+
scenario_run_tests() {
25+
if ! does_image_exist "${start_image}"; then
26+
echo "Image '${start_image}' not found - skipping test"
27+
return 0
28+
fi
29+
run_tests host1 \
30+
--variable "TARGET_REF:rhel96-bootc-source" \
31+
--variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \
32+
suites/upgrade/upgrade-successful.robot
33+
}

0 commit comments

Comments
 (0)