USHIFT-6718: major version changes for test framework#6372
Open
pacevedom wants to merge 7 commits intoopenshift:mainfrom
Open
USHIFT-6718: major version changes for test framework#6372pacevedom wants to merge 7 commits intoopenshift:mainfrom
pacevedom wants to merge 7 commits intoopenshift:mainfrom
Conversation
|
Important Review skippedAuto reviews are limited based on label configuration. 🚫 Review skipped — only excluded labels are configured. (1)
Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository YAML (base), Organization UI (inherited) Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
WalkthroughExtract OpenShift major and minor from version sources and propagate them across scripts, templates, and tests; replace hardcoded Changes
Estimated code review effort🎯 4 (Complex) | ⏱️ ~50 minutes ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
openshift-ci
bot
added
the
do-not-merge/work-in-progress
Contributor
|
Skipping CI for Draft Pull Request. |
Contributor
Author
|
/test ? |
openshift-ci
bot
added
the
approved
Contributor
Author
|
/test e2e-aws-tests |
Contributor
Author
|
/test e2e-aws-tests |
Contributor
Author
|
/test e2e-aws-testes |
Contributor
Author
|
/test e2e-aws-tests |
pacevedom
changed the title
openshift-ci-robot
added
the
jira/valid-reference
|
@pacevedom: This pull request references USHIFT-6718 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set. DetailsIn response to this: Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
Contributor
Author
|
@coderabbitai review |
✅ Actions performedReview triggered.
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 4
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@scripts/devenv-builder/configure-vm.sh`:
- Around line 279-282: The OCP_MAJOR/OCP_MINOR extraction is using cut on the
file path ${MAKE_VERSION} instead of the value read from the file; change it to
follow the pattern used at line 197 by first extracting MAKE_VERSION from the
file using grep + cut -d'=' -f2 (trimming whitespace), then parse that value
with cut -d'.' -f1 and -f2 to set OCP_MAJOR and OCP_MINOR, set
OCPVERSION="${OCP_MAJOR}.${OCP_MINOR}", and keep OCC_SRC construction the same;
update the variable names (MAKE_VERSION, OCP_MAJOR, OCP_MINOR, OCPVERSION,
OCC_SRC) where they are assigned so you parse the actual version string rather
than the file path.
In `@scripts/get-latest-rhocp-repo.sh`:
- Around line 47-48: The calculation of stop from current_minor can produce a
negative value which later generates invalid repo names; update the logic around
variables current_minor and stop so stop is clamped to a minimum of 0 before the
repo scan loop (the variable used in the for/seq loop around the lines that
iterate over minor versions). Locate the assignment to stop and replace it with
a safe clamp (e.g., set stop to 0 when current_minor - 3 is negative) so
subsequent checks that build repo URLs using current_minor and stop cannot
produce negative minors.
In `@scripts/release-notes/gen_gh_releases_from_mirror.py`:
- Around line 172-182: The code hardcodes url_base_aarch64 and url_base_x86
using the current branch major and then scans all versions with those bases,
which breaks when versions_to_scan contains a different major; update the calls
to find_new_releases so the mirror URL base is computed per version: for each
version in versions_to_scan determine its major (e.g., parse version -> major)
and call get_mirror_url_base(major_for_version, 'aarch64') and
get_mirror_url_base(major_for_version, 'x86_64') and then pass those per-version
url bases into find_new_releases (when invoking from the blocks that use args.ec
and args.rc) so each scanned version queries the correct openshift-v{major}
tree.
In `@test/bin/pyutils/generate_common_versions.py`:
- Around line 284-287: get_gitops_version() currently assumes compatibility with
major 4 and only decrements the minor, which breaks when
generate_common_versions() computes cross-major Y-1/Y-2 (e.g., --major 5 --minor
0). Update get_gitops_version() to be major-aware: accept or derive both major
and minor, and when probing fallback versions iterate using
get_previous_version(major, minor) (or the same logic used in
generate_common_versions) to step to previous minor/major pairs instead of just
decrementing minor; ensure the same change is applied for the other lookup block
referenced around lines 335-337 so all GITOPS_VERSION lookups use the
cross-major-aware fallback sequence.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro
Run ID: f0660fe4-2926-4a4e-aede-d055b2097a60
📒 Files selected for processing (19)
scripts/devenv-builder/configure-vm.shscripts/get-latest-rhocp-repo.shscripts/release-notes/gen_gh_releases_from_mirror.pyscripts/release-notes/gen_gh_releases_from_rhocp.pytest/assets/common_versions.sh.templatetest/bin/build_rpms.shtest/bin/common.shtest/bin/common_versions.shtest/bin/pyutils/build_bootc_images.pytest/bin/pyutils/generate_common_versions.pytest/bin/scenario.shtest/kickstart-templates/includes/post-cos9rpm.cfgtest/package-sources/rhocp-y.tomltest/package-sources/rhocp-y1.tomltest/package-sources/rhocp-y2.tomltest/scenarios/presubmits/el98-src@rpm-install.sh.disabledtest/scenarios/releases/el98@rpm-standard1.sh.disabledtest/scenarios/releases/el98@rpm-standard2.sh.disabledtest/scenarios/releases/el98@rpm-upgrade.sh.disabled
pacevedom
force-pushed
the
test-framework-5.0
branch
from
3c69948 to
c6a53ad
Compare
Contributor
Author
|
@coderabbitai review |
✅ Actions performedReview triggered.
|
There was a problem hiding this comment.
♻️ Duplicate comments (1)
test/bin/pyutils/generate_common_versions.py (1)
275-285:⚠️ Potential issue | 🟡 MinorAdd try/except for
get_previous_versionin gitops lookup.If the loop iterates close to a major boundary (e.g., starting at 4.1), line 284 will raise
KeyErrorwhen reaching 4.0's previous version.Proposed fix
for _ in range(4): for gitops_version_from_api_docs in data.get("data", [{}])[0].get("versions", []): gitops_version_ocp_compatibility = gitops_version_from_api_docs.get("openshift_compatibility") or "" gitops_version_number = gitops_version_from_api_docs.get("name") if f"{current_major}.{current_minor}" in gitops_version_ocp_compatibility: logging.info(f"Latest GitOps version: {gitops_version_number} which is compatible with OCP {gitops_version_ocp_compatibility}") return gitops_version_number - current_major, current_minor = get_previous_version(current_major, current_minor) + try: + current_major, current_minor = get_previous_version(current_major, current_minor) + except KeyError: + break return ""🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@test/bin/pyutils/generate_common_versions.py` around lines 275 - 285, The loop that walks previous versions calls get_previous_version(current_major, current_minor) without handling KeyError; wrap that call in a try/except KeyError around the invocation in the loop in generate_common_versions.py, log or handle the error (e.g., logging.warning and break or return an empty string) and stop iterating when a KeyError occurs so the function returns "" instead of raising; ensure you keep the existing behavior of returning gitops_version_number when found and returning "" on failure.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Duplicate comments:
In `@test/bin/pyutils/generate_common_versions.py`:
- Around line 275-285: The loop that walks previous versions calls
get_previous_version(current_major, current_minor) without handling KeyError;
wrap that call in a try/except KeyError around the invocation in the loop in
generate_common_versions.py, log or handle the error (e.g., logging.warning and
break or return an empty string) and stop iterating when a KeyError occurs so
the function returns "" instead of raising; ensure you keep the existing
behavior of returning gitops_version_number when found and returning "" on
failure.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro
Run ID: acadad9a-5a8a-46d3-b64b-fc8a9cf12de9
📒 Files selected for processing (19)
scripts/devenv-builder/configure-vm.shscripts/get-latest-rhocp-repo.shscripts/release-notes/gen_gh_releases_from_mirror.pyscripts/release-notes/gen_gh_releases_from_rhocp.pytest/assets/common_versions.sh.templatetest/bin/build_rpms.shtest/bin/common.shtest/bin/common_versions.shtest/bin/pyutils/build_bootc_images.pytest/bin/pyutils/generate_common_versions.pytest/bin/scenario.shtest/kickstart-templates/includes/post-cos9rpm.cfgtest/package-sources/rhocp-y.tomltest/package-sources/rhocp-y1.tomltest/package-sources/rhocp-y2.tomltest/scenarios/presubmits/el98-src@rpm-install.sh.disabledtest/scenarios/releases/el98@rpm-standard1.sh.disabledtest/scenarios/releases/el98@rpm-standard2.sh.disabledtest/scenarios/releases/el98@rpm-upgrade.sh.disabled
✅ Files skipped from review due to trivial changes (4)
- test/bin/common.sh
- test/bin/build_rpms.sh
- test/package-sources/rhocp-y2.toml
- test/package-sources/rhocp-y1.toml
🚧 Files skipped from review as they are similar to previous changes (8)
- test/bin/scenario.sh
- test/package-sources/rhocp-y.toml
- test/scenarios/presubmits/el98-src@rpm-install.sh.disabled
- scripts/get-latest-rhocp-repo.sh
- test/scenarios/releases/el98@rpm-standard1.sh.disabled
- test/scenarios/releases/el98@rpm-standard2.sh.disabled
- test/scenarios/releases/el98@rpm-upgrade.sh.disabled
- scripts/release-notes/gen_gh_releases_from_rhocp.py
Contributor
Author
|
/test e2e-aws-tests |
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
Contributor
Author
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
pacevedom
force-pushed
the
test-framework-5.0
branch
from
c6a53ad to
2db639e
Compare
There was a problem hiding this comment.
♻️ Duplicate comments (1)
test/bin/pyutils/generate_common_versions.py (1)
275-285:⚠️ Potential issue | 🟠 MajorUnhandled
KeyErrorcan crash the script.
get_previous_version()raisesKeyErrorwhen stepping past defined majors, but this call (line 284) isn't wrapped intry/exceptlikeget_dependencies_repo_url(lines 113-116). If the loop exhaustsVERSION_MAP, the script crashes.Proposed fix
current_major, current_minor = major_version, minor_version for _ in range(4): for gitops_version_from_api_docs in data.get("data", [{}])[0].get("versions", []): gitops_version_ocp_compatibility = gitops_version_from_api_docs.get("openshift_compatibility") or "" gitops_version_number = gitops_version_from_api_docs.get("name") if f"{current_major}.{current_minor}" in gitops_version_ocp_compatibility: logging.info(f"Latest GitOps version: {gitops_version_number} which is compatible with OCP {gitops_version_ocp_compatibility}") return gitops_version_number - current_major, current_minor = get_previous_version(current_major, current_minor) + try: + current_major, current_minor = get_previous_version(current_major, current_minor) + except KeyError: + break return ""🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@test/bin/pyutils/generate_common_versions.py` around lines 275 - 285, The loop in the version-selection logic can crash because get_previous_version(current_major, current_minor) may raise KeyError when versions are exhausted; wrap that call in a try/except KeyError inside the for-loop (the block using current_major/current_minor and gitops_version_from_api_docs) and on KeyError break out (or return an empty string) so the function safely falls through to the final return ""; ensure you update references to current_major/current_minor only when the call succeeds and preserve existing logging/return behavior for gitops_version_number.
🧹 Nitpick comments (1)
test/scenarios/presubmits/el98-src@rpm-install.sh.disabled (1)
44-72: Extractconfigure_rhocp_repo()into a shared helper.This exact repo-setup logic now lives here and in
test/scenarios/releases/el98@rpm-standard1.sh.disabledandtest/scenarios/releases/el98@rpm-standard2.sh.disabled. The next repo-format change will be easy to miss in one copy again.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@test/scenarios/presubmits/el98-src`@rpm-install.sh.disabled around lines 44 - 72, Extract the configure_rhocp_repo function into a shared helper script and replace the duplicated copies with calls to that helper: move the configure_rhocp_repo implementation (including use of run_command_on_vm, copy_file_to_vm, mktemp/tmp_file handling, ocp_repo_name logic and the two branches for numeric vs http rhocp values) into a common sourced file (e.g., a shared test helper) and update each caller script to source that helper and invoke configure_rhocp_repo with the same arguments; ensure the tmp file creation and removal, quoting, and error behavior are preserved when refactoring so existing behavior remains unchanged.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Duplicate comments:
In `@test/bin/pyutils/generate_common_versions.py`:
- Around line 275-285: The loop in the version-selection logic can crash because
get_previous_version(current_major, current_minor) may raise KeyError when
versions are exhausted; wrap that call in a try/except KeyError inside the
for-loop (the block using current_major/current_minor and
gitops_version_from_api_docs) and on KeyError break out (or return an empty
string) so the function safely falls through to the final return ""; ensure you
update references to current_major/current_minor only when the call succeeds and
preserve existing logging/return behavior for gitops_version_number.
---
Nitpick comments:
In `@test/scenarios/presubmits/el98-src`@rpm-install.sh.disabled:
- Around line 44-72: Extract the configure_rhocp_repo function into a shared
helper script and replace the duplicated copies with calls to that helper: move
the configure_rhocp_repo implementation (including use of run_command_on_vm,
copy_file_to_vm, mktemp/tmp_file handling, ocp_repo_name logic and the two
branches for numeric vs http rhocp values) into a common sourced file (e.g., a
shared test helper) and update each caller script to source that helper and
invoke configure_rhocp_repo with the same arguments; ensure the tmp file
creation and removal, quoting, and error behavior are preserved when refactoring
so existing behavior remains unchanged.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro
Run ID: cfebe57e-2add-42e0-9763-426048363e77
📒 Files selected for processing (19)
scripts/devenv-builder/configure-vm.shscripts/get-latest-rhocp-repo.shscripts/release-notes/gen_gh_releases_from_mirror.pyscripts/release-notes/gen_gh_releases_from_rhocp.pytest/assets/common_versions.sh.templatetest/bin/build_rpms.shtest/bin/common.shtest/bin/common_versions.shtest/bin/pyutils/build_bootc_images.pytest/bin/pyutils/generate_common_versions.pytest/bin/scenario.shtest/kickstart-templates/includes/post-cos9rpm.cfgtest/package-sources/rhocp-y.tomltest/package-sources/rhocp-y1.tomltest/package-sources/rhocp-y2.tomltest/scenarios/presubmits/el98-src@rpm-install.sh.disabledtest/scenarios/releases/el98@rpm-standard1.sh.disabledtest/scenarios/releases/el98@rpm-standard2.sh.disabledtest/scenarios/releases/el98@rpm-upgrade.sh.disabled
✅ Files skipped from review due to trivial changes (5)
- test/bin/scenario.sh
- test/bin/common.sh
- scripts/release-notes/gen_gh_releases_from_rhocp.py
- test/package-sources/rhocp-y2.toml
- test/package-sources/rhocp-y1.toml
🚧 Files skipped from review as they are similar to previous changes (4)
- scripts/get-latest-rhocp-repo.sh
- test/scenarios/releases/el98@rpm-upgrade.sh.disabled
- test/package-sources/rhocp-y.toml
- scripts/devenv-builder/configure-vm.sh
pacevedom
force-pushed
the
test-framework-5.0
branch
from
2db639e to
b512924
Compare
There was a problem hiding this comment.
Actionable comments posted: 1
♻️ Duplicate comments (1)
test/bin/pyutils/generate_common_versions.py (1)
275-285:⚠️ Potential issue | 🟠 MajorUnhandled KeyError in GitOps version lookup.
Line 284 calls
get_previous_version()without try/except. If the version iteration crosses into an unmapped major, it will crash instead of returning empty string.Suggested fix
if f"{current_major}.{current_minor}" in gitops_version_ocp_compatibility: logging.info(f"Latest GitOps version: {gitops_version_number} which is compatible with OCP {gitops_version_ocp_compatibility}") return gitops_version_number - current_major, current_minor = get_previous_version(current_major, current_minor) + try: + current_major, current_minor = get_previous_version(current_major, current_minor) + except KeyError: + break return ""🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@test/bin/pyutils/generate_common_versions.py` around lines 275 - 285, The loop in generate_common_versions.py can raise a KeyError when calling get_previous_version(current_major, current_minor); update the logic in the block using current_major/current_minor and get_previous_version to handle missing mappings by wrapping the get_previous_version call in a try/except KeyError (or check its return), and if a KeyError occurs return an empty string; ensure you reference the existing variables current_major/current_minor, the get_previous_version function, and the for-loop that iterates over data.get("data", [{}])[0].get("versions", []) so the behavior gracefully returns "" instead of crashing.
🧹 Nitpick comments (1)
scripts/release-notes/common.py (1)
71-75: Consolidate last-minor mapping to a single source of truth.
LAST_MINOR_FOR_MAJORhere duplicates version maps already defined inscripts/devenv-builder/configure-vm.shandtest/bin/pyutils/generate_common_versions.py. Drift between these files can silently produce inconsistent cross-major behavior across tools.As per coding guidelines, "Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity."
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@scripts/release-notes/common.py` around lines 71 - 75, The LAST_MINOR_FOR_MAJOR constant in scripts/release-notes/common.py duplicates mappings maintained elsewhere and should be replaced with a single source of truth; remove the hardcoded LAST_MINOR_FOR_MAJOR dict and load the mapping from the canonical generator (e.g., import or read the mapping produced by test/bin/pyutils/generate_common_versions.py or otherwise centralize on the config used by scripts/devenv-builder/configure-vm.sh), updating code that references LAST_MINOR_FOR_MAJOR to use the loaded mapping instead (refer to the LAST_MINOR_FOR_MAJOR symbol in this file and the generate_common_versions.py output to locate and wire the canonical source).
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@scripts/devenv-builder/configure-vm.sh`:
- Around line 303-307: The grep pattern in OCC_RPM is hardcoded to
"openshift-clients-4..." and will fail for other majors; change the pattern to
interpolate OCP_MAJOR (e.g., match "openshift-clients-${OCP_MAJOR}...") when
extracting RPM names in the OCC_RPM assignment so it discovers the correct
major-specific RPMs; update the pattern used in the grep inside the OCC_RPM
pipeline (refer to variables OCP_MAJOR and OCC_RPM) to be dynamic and still
escape dots/quotes as appropriate.
---
Duplicate comments:
In `@test/bin/pyutils/generate_common_versions.py`:
- Around line 275-285: The loop in generate_common_versions.py can raise a
KeyError when calling get_previous_version(current_major, current_minor); update
the logic in the block using current_major/current_minor and
get_previous_version to handle missing mappings by wrapping the
get_previous_version call in a try/except KeyError (or check its return), and if
a KeyError occurs return an empty string; ensure you reference the existing
variables current_major/current_minor, the get_previous_version function, and
the for-loop that iterates over data.get("data", [{}])[0].get("versions", []) so
the behavior gracefully returns "" instead of crashing.
---
Nitpick comments:
In `@scripts/release-notes/common.py`:
- Around line 71-75: The LAST_MINOR_FOR_MAJOR constant in
scripts/release-notes/common.py duplicates mappings maintained elsewhere and
should be replaced with a single source of truth; remove the hardcoded
LAST_MINOR_FOR_MAJOR dict and load the mapping from the canonical generator
(e.g., import or read the mapping produced by
test/bin/pyutils/generate_common_versions.py or otherwise centralize on the
config used by scripts/devenv-builder/configure-vm.sh), updating code that
references LAST_MINOR_FOR_MAJOR to use the loaded mapping instead (refer to the
LAST_MINOR_FOR_MAJOR symbol in this file and the generate_common_versions.py
output to locate and wire the canonical source).
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro
Run ID: 6b913e08-3e31-49c6-9a83-dcb10b85998a
📒 Files selected for processing (32)
scripts/auto-rebase/rebase_history.shscripts/devenv-builder/configure-vm.shscripts/get-latest-rhocp-repo.shscripts/release-notes/common.pyscripts/release-notes/gen_gh_releases_from_mirror.pyscripts/release-notes/gen_gh_releases_from_rhocp.pytest/assets/common_versions.sh.templatetest/bin/build_images.shtest/bin/build_rpms.shtest/bin/common.shtest/bin/common_versions.shtest/bin/pyutils/build_bootc_images.pytest/bin/pyutils/generate_common_versions.pytest/bin/scenario.shtest/kickstart-templates/includes/post-cos9rpm.cfgtest/package-sources/rhocp-y.tomltest/package-sources/rhocp-y1.tomltest/package-sources/rhocp-y2.tomltest/scenarios/periodics/el96-prel@el98-src@upgrade-ok.shtest/scenarios/periodics/el96-yminus2@el98-src@upgrade-ok.shtest/scenarios/presubmits/el96-prel@el98-src@upgrade-ok.shtest/scenarios/presubmits/el96-yminus2@el98-src@upgrade-ok.shtest/scenarios/presubmits/el98-src@rpm-install.sh.disabledtest/scenarios/releases/el96-yminus1@el98-lrel@lvms.shtest/scenarios/releases/el96-yminus1@el98-lrel@standard1.shtest/scenarios/releases/el96-yminus1@el98-lrel@standard2.shtest/scenarios/releases/el96-yminus2@el98-lrel@lvms.shtest/scenarios/releases/el96-yminus2@el98-lrel@standard1.shtest/scenarios/releases/el96-yminus2@el98-lrel@standard2.shtest/scenarios/releases/el98@rpm-standard1.sh.disabledtest/scenarios/releases/el98@rpm-standard2.sh.disabledtest/scenarios/releases/el98@rpm-upgrade.sh.disabled
✅ Files skipped from review due to trivial changes (4)
- test/bin/common.sh
- test/scenarios/releases/el96-yminus2@el98-lrel@standard1.sh
- test/scenarios/releases/el96-yminus2@el98-lrel@standard2.sh
- test/package-sources/rhocp-y2.toml
🚧 Files skipped from review as they are similar to previous changes (7)
- test/bin/scenario.sh
- test/bin/build_rpms.sh
- test/kickstart-templates/includes/post-cos9rpm.cfg
- test/scenarios/releases/el98@rpm-upgrade.sh.disabled
- test/package-sources/rhocp-y1.toml
- test/bin/pyutils/build_bootc_images.py
- test/scenarios/releases/el98@rpm-standard1.sh.disabled
pacevedom
force-pushed
the
test-framework-5.0
branch
from
b512924 to
a9b812b
Compare
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@scripts/devenv-builder/configure-vm.sh`:
- Around line 231-247: The previous-version lookup calls the RHOCP_REPO script
with only the minor version which makes get-latest-rhocp-repo.sh read the wrong
(current branch) major; update the calls that invoke "${RHOCP_REPO}" (inside the
block using get_prev_version, PREVIOUS_RHOCP, Y2_RHOCP) to pass both target
major and minor so the helper can compute the correct rhocp-X.Y name (or change
the helper to accept explicit major+minor). Concretely, change the two call
sites that currently do "${RHOCP_REPO}" "${prev_minor}" to pass "${prev_major}"
"${prev_minor}" and ensure get-latest-rhocp-repo.sh / RHOCP_REPO handles two
args (major, minor) rather than relying on its Makefile.version.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro
Run ID: 45e5f8cd-3e6e-429a-8472-5956b89279cf
📒 Files selected for processing (17)
scripts/auto-rebase/rebase_history.shscripts/devenv-builder/configure-vm.shscripts/release-notes/common.pyscripts/release-notes/gen_gh_releases_from_mirror.pyscripts/release-notes/gen_gh_releases_from_rhocp.pytest/bin/build_images.shtest/bin/scenario.shtest/scenarios/periodics/el96-prel@el98-src@upgrade-ok.shtest/scenarios/periodics/el96-yminus2@el98-src@upgrade-ok.shtest/scenarios/presubmits/el96-prel@el98-src@upgrade-ok.shtest/scenarios/presubmits/el96-yminus2@el98-src@upgrade-ok.shtest/scenarios/releases/el96-yminus1@el98-lrel@lvms.shtest/scenarios/releases/el96-yminus1@el98-lrel@standard1.shtest/scenarios/releases/el96-yminus1@el98-lrel@standard2.shtest/scenarios/releases/el96-yminus2@el98-lrel@lvms.shtest/scenarios/releases/el96-yminus2@el98-lrel@standard1.shtest/scenarios/releases/el96-yminus2@el98-lrel@standard2.sh
✅ Files skipped from review due to trivial changes (6)
- test/scenarios/periodics/el96-prel@el98-src@upgrade-ok.sh
- test/bin/build_images.sh
- test/scenarios/releases/el96-yminus1@el98-lrel@lvms.sh
- scripts/release-notes/gen_gh_releases_from_rhocp.py
- test/scenarios/presubmits/el96-yminus2@el98-src@upgrade-ok.sh
- test/scenarios/releases/el96-yminus1@el98-lrel@standard2.sh
🚧 Files skipped from review as they are similar to previous changes (7)
- test/scenarios/presubmits/el96-prel@el98-src@upgrade-ok.sh
- test/scenarios/periodics/el96-yminus2@el98-src@upgrade-ok.sh
- test/scenarios/releases/el96-yminus2@el98-lrel@standard1.sh
- scripts/release-notes/common.py
- test/bin/scenario.sh
- test/scenarios/releases/el96-yminus1@el98-lrel@standard1.sh
- test/scenarios/releases/el96-yminus2@el98-lrel@standard2.sh
pacevedom
force-pushed
the
test-framework-5.0
branch
from
a9b812b to
aeadecc
Compare
Contributor
|
@pacevedom: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
Contributor
Author
|
/hold cancael |
Contributor
Author
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
|
/lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jeff-roche, pacevedom The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
No description provided.