Skip to content

OTA-1542 sync rhel update for chainupgrade&cpou steps #65410

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.

Sign up for GitHub

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 1 commit into from
May 29, 2025
Merged

OTA-1542 sync rhel update for chainupgrade&cpou steps #65410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...r/step-registry/cucushift/chainupgrade/toimage/cucushift-chainupgrade-toimage-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,7 +1147,7 @@ for target in "${TARGET_RELEASES[@]}"; do
upgrade
check_upgrade_status

if [[ $(oc get nodes -l node.openshift.io/os_id=rhel) != "" ]]; then
if [[ "${TARGET_MINOR_VERSION}" -lt "19" ]] && [[ $(oc get nodes -l node.openshift.io/os_id=rhel) != "" ]]; then
echo "Found rhel worker..."
run_command "oc get node -owide"
if [[ $(oc get machineconfigpools worker -ojson | jq -r '.spec.paused') == "true" ]]; then
Expand Down
5 changes: 4 additions & 1 deletion ...ift/upgrade/cpou/unpause-worker-mcp/cucushift-upgrade-cpou-unpause-worker-mcp-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,17 @@ for mcp in "${normal_mcp_arr[@]}"
do
check_mcp ${mcp} "True"
done
current_minor_ver="$(oc get clusterversion --no-headers | awk '{print $2}' | cut -f2 -d.)"
echo -e "current minor version: ${current_minor_ver} \n"

IFS=" " read -r -a arr <<<"$PAUSED_MCP_NAME"
for mcp in "${arr[@]}";
do
check_mcp $mcp "False"
printf "\n"
unpause ${mcp}
printf "\n"
if [[ $(oc get nodes -l node.openshift.io/os_id=rhel) != "" ]]; then
if [[ "${current_minor_ver}" -lt "19" ]] && [[ $(oc get nodes -l node.openshift.io/os_id=rhel) != "" ]]; then
echo "Found rhel worker, this step is supposed to be used in eus upgrade, skipping mcp checking here, need to check it after rhel worker upgraded..."
run_command "oc get machineconfigpools"
run_command "oc get node -owide"
Expand Down
2 changes: 1 addition & 1 deletion ...tor/step-registry/cucushift/upgrade/rhel-worker/cucushift-upgrade-rhel-worker-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,13 +207,13 @@ EOF

# Upgrade RHEL node
function rhel_upgrade(){
local testcase="rhel"
echo "Upgrading RHEL nodes"
echo "Validating parsed Ansible inventory"
ansible-inventory -i "${SHARED_DIR}/ansible-hosts" --list --yaml
echo -e "\nRunning RHEL worker upgrade"
sed -i 's|^remote_tmp.*|remote_tmp = /tmp/.ansible|g' /usr/share/ansible/openshift-ansible/ansible.cfg
ansible-playbook -i "${SHARED_DIR}/ansible-hosts" /usr/share/ansible/openshift-ansible/playbooks/upgrade.yml -vvv || { export UPGRADE_FAILURE_TYPE="${testcase}"; return 1; }

check_upgrade_status
}

Expand Down