From 114007d268fdb9a91317d1fe7d2ac4eca70b3674 Mon Sep 17 00:00:00 2001
From: Trevor Vardeman <34040350+tvardema@users.noreply.github.com>
Date: Wed, 28 Aug 2024 13:14:35 -0500
Subject: [PATCH] MULTIARCH-4859 Adding an etcd optimization for slower disks
 (#55783)

---
 ...enshift-multiarch-master__nightly-4.18.yaml |  1 +
 .../libvirt/upi-install-libvirt-commands.sh    | 18 ++++++++++++++++++
 .../libvirt/upi-install-libvirt-ref.yaml       |  2 ++
 3 files changed, 21 insertions(+)

diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.18.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.18.yaml
index e112bd22c069..59679d6f6893 100644
--- a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.18.yaml
+++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.18.yaml
@@ -438,6 +438,7 @@ tests:
     env:
       ARCH: s390x
       BRANCH: "4.18"
+      ETCD_DISK_SPEED: slow
       NODE_TUNING: "true"
       TEST_TYPE: conformance-parallel
     workflow: openshift-e2e-libvirt-upi
diff --git a/ci-operator/step-registry/upi/install/libvirt/upi-install-libvirt-commands.sh b/ci-operator/step-registry/upi/install/libvirt/upi-install-libvirt-commands.sh
index 89bf62b3c5ce..93246390c0cf 100755
--- a/ci-operator/step-registry/upi/install/libvirt/upi-install-libvirt-commands.sh
+++ b/ci-operator/step-registry/upi/install/libvirt/upi-install-libvirt-commands.sh
@@ -293,6 +293,24 @@ for i in {1..30}; do
   sleep 15
 done
 
+# Patch etcd for allowing slower disks
+if [[ "${ETCD_DISK_SPEED}" == "slow" ]]; then
+  echo "Patching etcd cluster operator..."
+  oc patch etcd cluster --type=merge --patch '{"spec":{"controlPlaneHardwareSpeed":"Slower"}}'
+  for i in {1..30}; do
+    ETCD_CO_AVAILABLE=$(oc get co etcd | grep etcd | awk '{print $3}')
+    if [[ "${ETCD_CO_AVAILABLE}" == "True" ]]; then
+      echo "Patched successfully!"
+      break
+    fi
+    sleep 15
+  done
+  if [[ "${ETCD_CO_AVAILABLE}" != "True" ]]; then
+    echo "Etcd patch failed..."
+    exit 1
+  fi
+fi
+
 date "+%F %X" > "${SHARED_DIR}/CLUSTER_INSTALL_END_TIME"
 
 touch /tmp/install-complete
diff --git a/ci-operator/step-registry/upi/install/libvirt/upi-install-libvirt-ref.yaml b/ci-operator/step-registry/upi/install/libvirt/upi-install-libvirt-ref.yaml
index 842917ea8a33..6f186f634707 100644
--- a/ci-operator/step-registry/upi/install/libvirt/upi-install-libvirt-ref.yaml
+++ b/ci-operator/step-registry/upi/install/libvirt/upi-install-libvirt-ref.yaml
@@ -26,6 +26,8 @@ ref:
     default: '40G'
   - name: FIPS_ENABLED
     default: 'false'
+  - name: ETCD_DISK_SPEED
+    default: 'standard'
   resources:
     requests:
       cpu: 10m