add info message in agent step (#60252)

openshift · Jan 2, 2025 · 82d9e00 · 82d9e00
1 parent 87ab69e
commit 82d9e00
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/ci-operator/step-registry/hypershift/mce/agent/info/hypershift-mce-agent-info-commands.sh b/ci-operator/step-registry/hypershift/mce/agent/info/hypershift-mce-agent-info-commands.sh
@@ -31,6 +31,12 @@ oc get AgentServiceConfig agent -o yaml
 echo "Agent State"
 oc get agent -A -o jsonpath='{range .items[*]}BMH: {@.metadata.labels.agent-install\.openshift\.io/bmh} Agent: {@.metadata.name} State: {@.status.debugInfo.state}{"\n"}{end}'
 
+echo "HostedCluster"
+oc get hostedcluster -A
+
+echo "HostedCluster yaml"
+oc get hostedcluster -A -o yaml
+
 echo "**Guest cluster**"
 export KUBECONFIG=${SHARED_DIR}/nested_kubeconfig
 echo "HostedCluster ClusterOperators"

diff --git a/ci-operator/step-registry/hypershift/mce/install/hypershift-mce-install-commands.sh b/ci-operator/step-registry/hypershift/mce/install/hypershift-mce-install-commands.sh
@@ -251,6 +251,7 @@ if [ "$arch" == "x86_64" ]; then
 fi
 if (( $(awk 'BEGIN {print ("'"$MCE_VERSION"'" > 2.3)}') )); then /tmp/${HYPERSHIFT_NAME} version; else /tmp/${HYPERSHIFT_NAME} --version; fi
 
-# display HyperShift Operator Version
-oc get deployment -n hypershift operator -ojsonpath='{.spec.template.spec.containers[*].image}' | tee "$ARTIFACT_DIR/HyperShiftOperator-info.txt" >/dev/null; echo >> "$ARTIFACT_DIR/HyperShiftOperator-info.txt"
-oc logs -n hypershift -lapp=operator --tail=-1 -c operator | head -1 | jq >> "$ARTIFACT_DIR/HyperShiftOperator-info.txt"
+# display HyperShift Operator Version and MCE version
+oc get "$(oc get multiclusterengines -oname)" -ojsonpath="{.status.currentVersion}" > "$ARTIFACT_DIR/mce-version"
+oc get deployment -n hypershift operator -ojsonpath='{.spec.template.spec.containers[*].image}' | tee "$ARTIFACT_DIR/HyperShiftOperatorImage.txt" >/dev/null; echo > "$ARTIFACT_DIR/hypershiftoperator-image"
+oc logs -n hypershift -lapp=operator --tail=-1 -c operator | head -1 | jq > "$ARTIFACT_DIR/hypershift-version"