Merge pull request #1233 from jistr/b/bootstrap-command-ignoring-failures

 Don't ignore dnf upgrade failure in edpm_bootstrap_command

Author: openshift-merge-bot[bot]

docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc

@@ -530,17 +530,14 @@ ifeval::["{build}" != "downstream"]
           # https://issues.redhat.com/browse/RHOSZUUL-1517
           dnf -y install crypto-policies
           update-crypto-policies --set FIPS:NO-ENFORCE-EMS
-          # FIXME: perform dnf upgrade for other packages in EDPM ansible
-          # here we only ensuring that decontainerized libvirt can start
           ./venv/bin/repo-setup current-podified -b antelope -d centos9 --stream
           dnf -y upgrade openstack-selinux
           rm -f /run/virtlogd.pid
           rm -rf repo-setup-main
 endif::[]
 ifeval::["{build}" == "downstream"]
         edpm_bootstrap_command: |
-          # FIXME: perform dnf upgrade for other packages in EDPM ansible
-          # here we only ensuring that decontainerized libvirt can start
+          set -euxo pipefail
           dnf -y upgrade openstack-selinux
           rm -f /run/virtlogd.pid
 endif::[]

tests/roles/dataplane_adoption/defaults/main.yaml

@@ -121,8 +121,6 @@ edpm_bootstrap_command: |
   # Exclude ceph-common-18.2.7 as it's pulling newer openssl not compatible
   # with rhel 9.2 openssh
   dnf config-manager --setopt centos9-storage.exclude="ceph-common-18.2.7" --save
-  # FIXME: perform dnf upgrade for other packages in EDPM ansible
-  # here we only ensuring that decontainerized libvirt can start
   dnf -y upgrade openstack-selinux
   rm -f /run/virtlogd.pid
   {%+ endif +%}