Skip to content

Add OCP upgrade stage for RHOSO 18#22

Merged
openshift-merge-bot[bot] merged 4 commits into
mainfrom
ocp_upgrade
Jul 22, 2026
Merged

Add OCP upgrade stage for RHOSO 18#22
openshift-merge-bot[bot] merged 4 commits into
mainfrom
ocp_upgrade

Conversation

@dlaw4608

@dlaw4608 dlaw4608 commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

Port upgrade functionality from openshift-ir-plugin to support sequential
OCP upgrades on OSP 18. Supports versions 4.16-4.22

Passed manually in RHOSO deployment:

TASK [shiftstack.stages.upgrade : Display upgrade completion] ******************
ok: [localhost] => {
    "msg": "Successfully upgraded cluster from 4.21 to 4.22"
}

Next step is adding a job definiton for upgrade_4.21_to_4.22_osp18.yaml in ci-framework
Then E2E validation can be ran.

But this PR needs to be merged first

@ekuris-redhat ekuris-redhat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey Daniel, the ansible-lint CI is failing with 3 violations in collection/stages/roles/upgrade/tasks/single_upgrade.yml:

1. risky-shell-pipe - line 86 (task: "Get the OCP release digest")
2. risky-shell-pipe - line 116 (task: "Wait until the upgrade starts (Progressing=True)")

Shell tasks using pipes need the pipefail option so failures in any part of the pipe are caught. Fix by prepending set -o pipefail && to the command:

- name: Get the OCP release digest
  ansible.builtin.shell:
    cmd: set -o pipefail && your_command | grep something

3. jinja[spacing] - line 161 (warning, but blocks the required production profile)

Remove the extra spaces around the outer parentheses:

- {{ ( ((finish_time | to_datetime('%Y-%m-%dT%H:%M:%S')) - (start_time | to_datetime('%Y-%m-%dT%H:%M:%S'))).total_seconds() / 60 ) | int }}
+ {{ (((finish_time | to_datetime('%Y-%m-%dT%H:%M:%S')) - (start_time | to_datetime('%Y-%m-%dT%H:%M:%S'))).total_seconds() / 60) | int }}

Once these 3 are fixed, CI should go green.

@ekuris-redhat ekuris-redhat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

tusharjadhav3302 and others added 4 commits July 16, 2026 13:41
…er merge

Co-authored-by: Cursor <cursoragent@cursor.com>
…e artifacts_dir

Co-authored-by: Cursor <cursoragent@cursor.com>
Fix Polarion junitparser merge failure caused by day2ops report XML in test_results
  Port upgrade functionality from openshift-ir-plugin to support sequential
  OCP upgrades on OSP 18. Supports versions 4.16-4.23, automatically builds
  upgrade paths skipping unsupported versions like 4.17.

  Includes version-specific workarounds for 4.16 consoleplugins and 4.19
  k8s API acknowledgment. Collects must-gather on failure.
Change-Id: I8c0b804cb91774fb5bb5fccf47cdb6015d46d771
Signed-off-by: Daniel Lawton <dlawton@redhat.com>
@openshift-ci

openshift-ci Bot commented Jul 22, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ekuris-redhat

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ekuris-redhat

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Jul 22, 2026
@ekuris-redhat ekuris-redhat changed the title DNM: Add OCP upgrade stage for OSP 18 DNM: Add OCP upgrade stage for RHOSO 18 Jul 22, 2026
@openshift-merge-bot
openshift-merge-bot Bot merged commit 8257637 into main Jul 22, 2026
2 checks passed
@dlaw4608 dlaw4608 changed the title DNM: Add OCP upgrade stage for RHOSO 18 Add OCP upgrade stage for RHOSO 18 Jul 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

3 participants