From c3c01c7dfd898e49110a7a7df45327f910176532 Mon Sep 17 00:00:00 2001 From: Gilad Ravid Date: Wed, 24 Jun 2026 15:46:13 +0300 Subject: [PATCH] MGMT-24419: Don't try to get the DataImage after ICI's installation completes --- .../gather/image-based-install-operator-gather-commands.sh | 2 -- .../gather/image-based-install-operator-post-gather-commands.sh | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/image-based-install-operator/gather/image-based-install-operator-gather-commands.sh b/ci-operator/step-registry/image-based-install-operator/gather/image-based-install-operator-gather-commands.sh index 95a15a38bb863..c90f12e89f63a 100644 --- a/ci-operator/step-registry/image-based-install-operator/gather/image-based-install-operator-gather-commands.sh +++ b/ci-operator/step-registry/image-based-install-operator/gather/image-based-install-operator-gather-commands.sh @@ -23,7 +23,6 @@ source network.sh export HUB_DIR=/ibio-gather/hub mkdir -p ${HUB_DIR} oc get baremetalhost ostest-extraworker-0 -n openshift-machine-api -o yaml > ${HUB_DIR}/baremetalhost.yaml -oc get dataimage ostest-extraworker-0 -n openshift-machine-api -o yaml > ${HUB_DIR}/dataimage.yaml oc get clusterdeployment ibi-cluster -n ibi-cluster -o yaml > ${HUB_DIR}/clusterdeployment.yaml oc get imageclusterinstall ibi-cluster -n ibi-cluster -o yaml > ${HUB_DIR}/imageclusterinstall.yaml oc logs --tail=-1 -l app=image-based-install-operator -n image-based-install-operator -c manager > ${HUB_DIR}/image-based-install-operator-manager.log @@ -36,7 +35,6 @@ export SSH_FLAGS="-n -o IdentityFile=/home/ib-orchestrate-vm/bip-orchestrate-vm/ # even if there is an error connecting to the ibi-host we still want the previous artifacts, so don't fail ssh ${SSH_FLAGS} core@${IBI_VM_IP} "sudo journalctl -u installation-configuration.service" > ${IBI_HOST_DIR}/installation-configuration.log || true ssh ${SSH_FLAGS} core@${IBI_VM_IP} "sudo tar -czf - /opt/openshift" > ${IBI_HOST_DIR}/opt-openshift.tar.gz || true -ssh ${SSH_FLAGS} core@${IBI_VM_IP} "sudo mkdir /mnt/config-iso && sudo mount /dev/sr0 /mnt/config-iso && sudo tar -czf - /mnt/config-iso" > ${IBI_HOST_DIR}/config-iso.tar.gz || true EOF diff --git a/ci-operator/step-registry/image-based-install-operator/post/gather/image-based-install-operator-post-gather-commands.sh b/ci-operator/step-registry/image-based-install-operator/post/gather/image-based-install-operator-post-gather-commands.sh index 936856ff48e4c..0083bb6fde7c3 100644 --- a/ci-operator/step-registry/image-based-install-operator/post/gather/image-based-install-operator-post-gather-commands.sh +++ b/ci-operator/step-registry/image-based-install-operator/post/gather/image-based-install-operator-post-gather-commands.sh @@ -26,6 +26,8 @@ oc get baremetalhost ostest-extraworker-0 -n openshift-machine-api -o yaml > ${A # in case of an error in deleting the dataimage, we want to see it oc get dataimage ostest-extraworker-0 -n openshift-machine-api -o yaml > ${ARTIFACT_DIR}/dataimage.yaml || true oc get clusterdeployment ibi-cluster -n ibi-cluster -o yaml > ${ARTIFACT_DIR}/clusterdeployment.yaml +# in case of an error in deleting the imageclusterinstall, we want to see it +oc get imageclusterinstall ibi-cluster -n ibi-cluster -o yaml > ${HUB_DIR}/imageclusterinstall.yaml || true oc logs --tail=-1 -l app=image-based-install-operator -n image-based-install-operator -c manager > ${ARTIFACT_DIR}/image-based-install-operator-manager.log oc logs --tail=-1 -l app=image-based-install-operator -n image-based-install-operator -c server > ${ARTIFACT_DIR}/image-based-install-operator-server.log