-
Notifications
You must be signed in to change notification settings - Fork 229
OCPBUGS-83693: RHEL 10 RPM-based installation testing in CI #6587
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.
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
Merged
openshift-merge-bot
merged 3 commits into
openshift:main
from
ggiguash:rhel10-image-installer-support
Apr 27, 2026
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
test/image-blueprints-bootc/el10/layer1-base/group2/rhel102-installer.image-installer
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
|
|
||
| # TODO: Replace this by a RHEL 10.2 image when its RPM repositories are released. | ||
| # rhel-10.2 | ||
| rhel-10.1 |
4 changes: 4 additions & 0 deletions
4
test/image-blueprints-bootc/el9/layer1-base/group2/rhel98-installer.image-installer
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
|
|
||
| # TODO: Replace this by a RHEL 9.8 image when its RPM repositories are released. | ||
| # rhel-9.8 | ||
| rhel-9.7 |
119 changes: 119 additions & 0 deletions
119
test/scenarios-bootc/el10/presubmits/el102-src@rpm-install.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Sourced from scenario.sh and uses functions defined there. | ||
|
|
||
| # The RPM-based image used to create the VM for this test does not | ||
| # include MicroShift or greenboot, so tell the framework not to wait | ||
| # for greenboot to finish when creating the VM. | ||
| export SKIP_GREENBOOT=true | ||
|
|
||
| # NOTE: Unlike most suites, these tests rely on being run IN ORDER to | ||
| # ensure the host is in a good state at the start of each test. We | ||
| # could have separated them and run them as separate scenarios, but | ||
| # did not want to spend the resources on a new VM. | ||
| export TEST_RANDOMIZATION=none | ||
|
|
||
| configure_microshift_mirror() { | ||
| local -r repo=$1 | ||
|
|
||
| # `repo` might be empty if we install microshift from rhocp | ||
| if [[ -z "${repo}" ]] ; then | ||
| return | ||
| fi | ||
|
|
||
| # `repo` might be an enabled repo from a released version instead | ||
| # of a mirror. | ||
| if [[ ! "${repo}" =~ ^http ]]; then | ||
| return | ||
| fi | ||
|
|
||
| local -r tmp_file=$(mktemp) | ||
| tee "${tmp_file}" >/dev/null <<EOF | ||
| [microshift-mirror-rpms] | ||
| name=MicroShift Mirror | ||
| baseurl=${repo} | ||
| enabled=1 | ||
| gpgcheck=0 | ||
| skip_if_unavailable=0 | ||
| EOF | ||
| copy_file_to_vm host1 "${tmp_file}" "${tmp_file}" | ||
| run_command_on_vm host1 "sudo cp ${tmp_file} /etc/yum.repos.d/microshift-mirror-rpms.repo" | ||
| rm -f "${tmp_file}" | ||
| } | ||
|
|
||
| configure_rhocp_repo() { | ||
| local -r rhocp=$1 | ||
| local -r major=$2 | ||
| local -r minor=$3 | ||
|
|
||
| # The repository may be empty if the beta mirror is not up yet | ||
| if [[ -z "${rhocp}" ]] ; then | ||
| return | ||
| fi | ||
|
|
||
| if [[ "${rhocp}" =~ ^[0-9]{1,2}$ ]]; then | ||
| run_command_on_vm host1 "sudo subscription-manager repos --enable rhocp-${major}.${rhocp}-for-rhel-9-\$(uname -m)-rpms" | ||
| elif [[ "${rhocp}" =~ ^http ]]; then | ||
| local -r ocp_repo_name="rhocp-${major}.${minor}-for-rhel-9-mirrorbeta-rpms" | ||
| local -r tmp_file=$(mktemp) | ||
|
|
||
| tee "${tmp_file}" >/dev/null <<EOF | ||
| [${ocp_repo_name}] | ||
| name=Beta rhocp RPMs for RHEL 9 | ||
| baseurl=${rhocp} | ||
| enabled=1 | ||
| gpgcheck=0 | ||
| skip_if_unavailable=0 | ||
| EOF | ||
|
ggiguash marked this conversation as resolved.
|
||
| copy_file_to_vm host1 "${tmp_file}" "${tmp_file}" | ||
| run_command_on_vm host1 "sudo cp ${tmp_file} /etc/yum.repos.d/${ocp_repo_name}.repo" | ||
| rm -f "${tmp_file}" | ||
| fi | ||
| } | ||
|
|
||
| scenario_create_vms() { | ||
| prepare_kickstart host1 kickstart-liveimg.ks.template "" | ||
| launch_vm rhel102-installer | ||
|
|
||
| # Open the firewall ports. Other scenarios get this behavior by | ||
| # embedding settings in the blueprint, but there is no blueprint | ||
| # for this scenario. We need do this step before running the RF | ||
| # suite so that suite can assume it can reach all of the same | ||
| # ports as for any other test. | ||
| configure_vm_firewall host1 | ||
|
|
||
| # Register the host with subscription manager so we can install | ||
| # dependencies. | ||
| subscription_manager_register host1 | ||
| } | ||
|
|
||
| scenario_remove_vms() { | ||
| remove_vm host1 | ||
| } | ||
|
|
||
| scenario_run_tests() { | ||
| local -r source_reponame=$(basename "${LOCAL_REPO}") | ||
| local -r source_repo_url="${WEB_SERVER_URL}/rpm-repos/${source_reponame}" | ||
| local -r target_version=$(local_rpm_version) | ||
|
|
||
| # Enable the rhocp and dependency repositories. | ||
| # | ||
| # Note that rhocp or beta dependencies repository may not yet exist | ||
| # for the current version. Then, just use whatever we can get for | ||
| # the previous minor version. | ||
| configure_rhocp_repo "${RHOCP_MINOR_Y}" "${MAJOR_VERSION}" "${MINOR_VERSION}" | ||
| configure_rhocp_repo "${RHOCP_MINOR_Y_BETA}" "${MAJOR_VERSION}" "${MINOR_VERSION}" | ||
| configure_rhocp_repo "${RHOCP_MINOR_Y1}" "${PREVIOUS_MAJOR_VERSION}" "${PREVIOUS_MINOR_VERSION}" | ||
| configure_rhocp_repo "${RHOCP_MINOR_Y1_BETA}" "${PREVIOUS_MAJOR_VERSION}" "${PREVIOUS_MINOR_VERSION}" | ||
| configure_microshift_mirror "${PREVIOUS_RELEASE_REPO}" | ||
| run_command_on_vm host1 "sudo subscription-manager repos --enable fast-datapath-for-rhel-10-\$(uname -m)-rpms" | ||
|
|
||
| run_tests host1 \ | ||
| --exitonfailure \ | ||
| --variable "SOURCE_REPO_URL:${source_repo_url}" \ | ||
| --variable "TARGET_VERSION:${target_version}" \ | ||
| --variable "PREVIOUS_MINOR_VERSION:${PREVIOUS_MINOR_VERSION}" \ | ||
| suites/rpm/install.robot \ | ||
| suites/rpm/remove.robot \ | ||
| suites/rpm/upgrade-successful.robot | ||
| } | ||
119 changes: 119 additions & 0 deletions
119
test/scenarios-bootc/el9/presubmits/el98-src@rpm-install.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Sourced from scenario.sh and uses functions defined there. | ||
|
|
||
| # The RPM-based image used to create the VM for this test does not | ||
| # include MicroShift or greenboot, so tell the framework not to wait | ||
| # for greenboot to finish when creating the VM. | ||
| export SKIP_GREENBOOT=true | ||
|
|
||
| # NOTE: Unlike most suites, these tests rely on being run IN ORDER to | ||
| # ensure the host is in a good state at the start of each test. We | ||
| # could have separated them and run them as separate scenarios, but | ||
| # did not want to spend the resources on a new VM. | ||
| export TEST_RANDOMIZATION=none | ||
|
|
||
| configure_microshift_mirror() { | ||
| local -r repo=$1 | ||
|
|
||
| # `repo` might be empty if we install microshift from rhocp | ||
| if [[ -z "${repo}" ]] ; then | ||
| return | ||
| fi | ||
|
|
||
| # `repo` might be an enabled repo from a released version instead | ||
| # of a mirror. | ||
| if [[ ! "${repo}" =~ ^http ]]; then | ||
| return | ||
| fi | ||
|
|
||
| local -r tmp_file=$(mktemp) | ||
| tee "${tmp_file}" >/dev/null <<EOF | ||
| [microshift-mirror-rpms] | ||
| name=MicroShift Mirror | ||
| baseurl=${repo} | ||
| enabled=1 | ||
| gpgcheck=0 | ||
| skip_if_unavailable=0 | ||
| EOF | ||
| copy_file_to_vm host1 "${tmp_file}" "${tmp_file}" | ||
| run_command_on_vm host1 "sudo cp ${tmp_file} /etc/yum.repos.d/microshift-mirror-rpms.repo" | ||
| rm -f "${tmp_file}" | ||
|
ggiguash marked this conversation as resolved.
|
||
| } | ||
|
|
||
| configure_rhocp_repo() { | ||
| local -r rhocp=$1 | ||
| local -r major=$2 | ||
| local -r minor=$3 | ||
|
|
||
| # The repository may be empty if the beta mirror is not up yet | ||
| if [[ -z "${rhocp}" ]] ; then | ||
| return | ||
| fi | ||
|
|
||
| if [[ "${rhocp}" =~ ^[0-9]{1,2}$ ]]; then | ||
| run_command_on_vm host1 "sudo subscription-manager repos --enable rhocp-${major}.${rhocp}-for-rhel-9-\$(uname -m)-rpms" | ||
| elif [[ "${rhocp}" =~ ^http ]]; then | ||
| local -r ocp_repo_name="rhocp-${major}.${minor}-for-rhel-9-mirrorbeta-rpms" | ||
| local -r tmp_file=$(mktemp) | ||
|
|
||
| tee "${tmp_file}" >/dev/null <<EOF | ||
| [${ocp_repo_name}] | ||
| name=Beta rhocp RPMs for RHEL 9 | ||
| baseurl=${rhocp} | ||
| enabled=1 | ||
| gpgcheck=0 | ||
| skip_if_unavailable=0 | ||
| EOF | ||
| copy_file_to_vm host1 "${tmp_file}" "${tmp_file}" | ||
| run_command_on_vm host1 "sudo cp ${tmp_file} /etc/yum.repos.d/${ocp_repo_name}.repo" | ||
| rm -f "${tmp_file}" | ||
| fi | ||
| } | ||
|
|
||
| scenario_create_vms() { | ||
| prepare_kickstart host1 kickstart-liveimg.ks.template "" | ||
| launch_vm rhel98-installer | ||
|
|
||
| # Open the firewall ports. Other scenarios get this behavior by | ||
| # embedding settings in the blueprint, but there is no blueprint | ||
| # for this scenario. We need do this step before running the RF | ||
| # suite so that suite can assume it can reach all of the same | ||
| # ports as for any other test. | ||
| configure_vm_firewall host1 | ||
|
|
||
| # Register the host with subscription manager so we can install | ||
| # dependencies. | ||
| subscription_manager_register host1 | ||
| } | ||
|
|
||
| scenario_remove_vms() { | ||
| remove_vm host1 | ||
| } | ||
|
|
||
| scenario_run_tests() { | ||
| local -r source_reponame=$(basename "${LOCAL_REPO}") | ||
| local -r source_repo_url="${WEB_SERVER_URL}/rpm-repos/${source_reponame}" | ||
| local -r target_version=$(local_rpm_version) | ||
|
|
||
| # Enable the rhocp and dependency repositories. | ||
| # | ||
| # Note that rhocp or beta dependencies repository may not yet exist | ||
| # for the current version. Then, just use whatever we can get for | ||
| # the previous minor version. | ||
| configure_rhocp_repo "${RHOCP_MINOR_Y}" "${MAJOR_VERSION}" "${MINOR_VERSION}" | ||
| configure_rhocp_repo "${RHOCP_MINOR_Y_BETA}" "${MAJOR_VERSION}" "${MINOR_VERSION}" | ||
| configure_rhocp_repo "${RHOCP_MINOR_Y1}" "${PREVIOUS_MAJOR_VERSION}" "${PREVIOUS_MINOR_VERSION}" | ||
| configure_rhocp_repo "${RHOCP_MINOR_Y1_BETA}" "${PREVIOUS_MAJOR_VERSION}" "${PREVIOUS_MINOR_VERSION}" | ||
| configure_microshift_mirror "${PREVIOUS_RELEASE_REPO}" | ||
| run_command_on_vm host1 "sudo subscription-manager repos --enable fast-datapath-for-rhel-9-\$(uname -m)-rpms" | ||
|
|
||
| run_tests host1 \ | ||
| --exitonfailure \ | ||
| --variable "SOURCE_REPO_URL:${source_repo_url}" \ | ||
| --variable "TARGET_VERSION:${target_version}" \ | ||
| --variable "PREVIOUS_MINOR_VERSION:${PREVIOUS_MINOR_VERSION}" \ | ||
| suites/rpm/install.robot \ | ||
| suites/rpm/remove.robot \ | ||
| suites/rpm/upgrade-successful.robot | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.