fix

openshift · Dec 31, 2024 · 9d687b9 · 9d687b9
1 parent a3a6d6b
commit 9d687b9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/...perator/step-registry/baremetal/lab/agent/install/baremetal-lab-agent-install-commands.sh b/...perator/step-registry/baremetal/lab/agent/install/baremetal-lab-agent-install-commands.sh
@@ -282,9 +282,10 @@ if ! wait "$!"; then
   exit 1
 fi
 
+# Used by observer pod
+touch  "${SHARED_DIR}/success"
+
 echo "Ensure that all the cluster operators remain stable and ready until OCPBUGS-18658 is fixed."
 oc adm wait-for-stable-cluster --minimum-stable-period=1m --timeout=15m
 update_image_registry
 
-# Used by observer pod
-touch  "${SHARED_DIR}/success"
diff --git a/ci-operator/step-registry/baremetal/lab/ipi/install/baremetal-lab-ipi-install-commands.sh b/ci-operator/step-registry/baremetal/lab/ipi/install/baremetal-lab-ipi-install-commands.sh
@@ -219,10 +219,6 @@ cp "${INSTALL_DIR}/auth/kubeconfig" "${SHARED_DIR}/"
 cp "${INSTALL_DIR}/auth/kubeadmin-password" "${SHARED_DIR}/"
 scp "${SSHOPTS[@]}" "${INSTALL_DIR}"/auth/* "root@${AUX_HOST}:/var/builds/${CLUSTER_NAME}/"
 
-# Creating file straight into $SHARED_DIR is not 100% reliable because of propagation issues (author guessing)
-oinst coreos print-stream-json > "${INSTALL_DIR}/coreos-stream.json"
-cp "${INSTALL_DIR}/coreos-stream.json" "${SHARED_DIR}/"
-
 date "+%F %X" > "${SHARED_DIR}/CLUSTER_INSTALL_START_TIME"
 
 # The installer's terraform template using the ironic provider needs to reach the ironic endpoint in the bootstrap VM
@@ -241,8 +237,6 @@ echo -e "\n[INFO] Launching 'wait-for install-complete' installation step again.
 oinst wait-for install-complete &
 if ! wait "$!"; then
   echo "ERROR: Installation failed. Aborting execution."
-  # Used by observer pod
-  touch "${SHARED_DIR}/failure"
   exit 1
 fi
 update_image_registry

diff --git a/ci-operator/step-registry/baremetal/lab/upi/install/baremetal-lab-upi-install-commands.sh b/ci-operator/step-registry/baremetal/lab/upi/install/baremetal-lab-upi-install-commands.sh
@@ -314,10 +314,6 @@ cp "${INSTALL_DIR}/metadata.json" "${SHARED_DIR}/"
 cp "${INSTALL_DIR}/auth/kubeconfig" "${SHARED_DIR}/"
 cp "${INSTALL_DIR}/auth/kubeadmin-password" "${SHARED_DIR}/"
 
-# Creating file straight into $SHARED_DIR is not 100% reliable because of propagation issues (author guessing)
-oinst coreos print-stream-json > "${INSTALL_DIR}/coreos-stream.json"
-cp "${INSTALL_DIR}/coreos-stream.json" "${SHARED_DIR}/"
-
 echo -e "\nPower on the hosts..."
 # shellcheck disable=SC2154
 for bmhost in $(yq e -o=j -I=0 '.[]' "${SHARED_DIR}/hosts.yaml"); do
@@ -354,8 +350,6 @@ echo -e "\nLaunching 'wait-for install-complete' installation step....."
 oinst wait-for install-complete &
 if ! wait "$!"; then
   echo "ERROR: Installation failed. Aborting execution."
-  # Used by observer pod
-  touch  "${SHARED_DIR}/failure"
   # TODO
   exit 1
 fi