From eaa41315a534328e4b588fb4c705d50ac3adae0a Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 31 May 2023 14:23:01 +0200 Subject: [PATCH] CI: Unbreak stable/yoga with two cherry-picks 1) CI: Enable bare metal testing for Ubuntu upgrades More than one year ago, change I96827fc32c1594ca9a0535e259929c49d3f0e704 enabled bare metal testing on Ubuntu, but only for non-upgrade jobs. It should be safe to test during upgrade jobs too. (cherry picked from commit 916ffba691cfae80490b7accedd26eb65328f6ea) 2) CI: Disable bare metal testing on RL9/c9s Rocky Linux 9.2 shipped with Libvirt 9.0.0 which breaks our bare metal testing. Temporarily run bare metal testing only on Ubuntu. This allows us to make rocky9 jobs voting again. Adapted to continue running CS8 bare metal testing. (cherry picked from commit 21c68bbfafe529e1c337ba242c2e501c75bfedaa) Change-Id: I9c698916999b30bf3fd8f7dfe5add7d332a84b6c --- playbooks/kayobe-overcloud-base/run.yml | 2 ++ playbooks/kayobe-overcloud-upgrade-base/run.yml | 16 ++++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/playbooks/kayobe-overcloud-base/run.yml b/playbooks/kayobe-overcloud-base/run.yml index 350b47dfd..b5471c9d9 100644 --- a/playbooks/kayobe-overcloud-base/run.yml +++ b/playbooks/kayobe-overcloud-base/run.yml @@ -30,3 +30,5 @@ cmd: dev/overcloud-test-baremetal.sh &> {{ logs_dir }}/ansible/overcloud-test-baremetal chdir: "{{ kayobe_src_dir }}" executable: /bin/bash + # FIXME(priteau): Bare metal testing fails on RL9/c9s with Libvirt 9.0.0 + when: ansible_facts.os_family == 'Debian' or ansible_facts.distribution_major_version | int == 8 diff --git a/playbooks/kayobe-overcloud-upgrade-base/run.yml b/playbooks/kayobe-overcloud-upgrade-base/run.yml index 677b7c290..19f292f49 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/run.yml +++ b/playbooks/kayobe-overcloud-upgrade-base/run.yml @@ -80,12 +80,8 @@ cmd: dev/overcloud-test-baremetal.sh &> {{ logs_dir }}/ansible/overcloud-test-bm-pre-upgrade chdir: "{{ previous_kayobe_src_dir }}" executable: /bin/bash - # FIXME(mgoddard): Bare metal testing is unreliable on Ubuntu - some jobs - # see IPMI failures such as the following: - # ipmitool chassis bootdev pxe - # Error setting Chassis Boot Parameter 5\nError setting Chassis Boot - # Parameter 0\n - when: ansible_facts.os_family != 'Debian' + # FIXME(priteau): Bare metal testing fails on RL9/c9s with Libvirt 9.0.0 + when: ansible_facts.os_family == 'Debian' or ansible_facts.distribution_major_version | int == 8 # Upgrade Kayobe, and use it to perform an upgrade of the control plane. @@ -113,12 +109,8 @@ cmd: dev/overcloud-test-baremetal.sh &> {{ logs_dir }}/ansible/overcloud-test-bm-post-upgrade chdir: "{{ kayobe_src_dir }}" executable: /bin/bash - # FIXME(mgoddard): Bare metal testing is unreliable on Ubuntu - some jobs - # see IPMI failures such as the following: - # ipmitool chassis bootdev pxe - # Error setting Chassis Boot Parameter 5\nError setting Chassis Boot - # Parameter 0\n - when: ansible_facts.os_family != 'Debian' + # FIXME(priteau): Bare metal testing fails on RL9/c9s with Libvirt 9.0.0 + when: ansible_facts.os_family == 'Debian' or ansible_facts.distribution_major_version | int == 8 environment: KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}"