From 9b94b82e211e312a01f3662dd596ad44d0beb11a Mon Sep 17 00:00:00 2001 From: Shai Oren Date: Thu, 6 Aug 2026 22:22:18 +0300 Subject: [PATCH] Add use of key for shutdown --- ...ional-cnf-ran-ibu-eco-gotests-seed-commands.sh | 15 +++++++++++++-- ...al-cnf-ran-ibu-eco-gotests-upgrade-commands.sh | 6 +++--- ...ional-cnf-ran-ibu-eco-gotests-upgrade-ref.yaml | 4 +++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ci-operator/step-registry/telcov10n/functional/cnf-ran/ibu-eco-gotests-seed/telcov10n-functional-cnf-ran-ibu-eco-gotests-seed-commands.sh b/ci-operator/step-registry/telcov10n/functional/cnf-ran/ibu-eco-gotests-seed/telcov10n-functional-cnf-ran-ibu-eco-gotests-seed-commands.sh index 008b3253fde29..ec2a8365274ef 100644 --- a/ci-operator/step-registry/telcov10n/functional/cnf-ran/ibu-eco-gotests-seed/telcov10n-functional-cnf-ran-ibu-eco-gotests-seed-commands.sh +++ b/ci-operator/step-registry/telcov10n/functional/cnf-ran/ibu-eco-gotests-seed/telcov10n-functional-cnf-ran-ibu-eco-gotests-seed-commands.sh @@ -148,9 +148,20 @@ for f in "${ARTIFACT_DIR}/junit_eco_gotests/"*.xml; do done echo "" -echo "=== Step 3: Power off seed spoke VM ===" +echo "=== Step 3: Power off seed spoke node ===" + +grep ansible_ssh_private_key -A 100 \ + "${OCP_DEPLOYMENT_INVENTORY_PATH}/host_vars/master-0" \ + | sed 's/ansible_ssh_private_key: //g' \ + | sed "s/'//g" \ + | sed 's/^ //' \ + | sed -n '/BEGIN/,/END/p' \ + > /tmp/spoke-master-ssh-key +chmod 600 /tmp/spoke-master-ssh-key ansible-playbook playbooks/ran/ibu-poweroff-seed-spoke.yml \ - -i "${OCP_DEPLOYMENT_INVENTORY_PATH}/build-inventory.py" + -i "${OCP_DEPLOYMENT_INVENTORY_PATH}/build-inventory.py" \ + --private-key=/tmp/spoke-master-ssh-key +rm -f /tmp/spoke-master-ssh-key echo "" echo "=== IBU Seed Eco-Gotests Complete ===" diff --git a/ci-operator/step-registry/telcov10n/functional/cnf-ran/ibu-eco-gotests-upgrade/telcov10n-functional-cnf-ran-ibu-eco-gotests-upgrade-commands.sh b/ci-operator/step-registry/telcov10n/functional/cnf-ran/ibu-eco-gotests-upgrade/telcov10n-functional-cnf-ran-ibu-eco-gotests-upgrade-commands.sh index 581d21f7c75b1..a0e63b677e539 100755 --- a/ci-operator/step-registry/telcov10n/functional/cnf-ran/ibu-eco-gotests-upgrade/telcov10n-functional-cnf-ran-ibu-eco-gotests-upgrade-commands.sh +++ b/ci-operator/step-registry/telcov10n/functional/cnf-ran/ibu-eco-gotests-upgrade/telcov10n-functional-cnf-ran-ibu-eco-gotests-upgrade-commands.sh @@ -48,7 +48,7 @@ MOUNTED_SPOKE_INVENTORY="/var/host_variables/${TARGET_CLUSTER_NAME}/spoke-master echo "=== IBU Upgrade eco-gotests Configuration ===" echo "TARGET_CLUSTER_NAME=${TARGET_CLUSTER_NAME}" -echo "TARGET_SPOKE_CLUSTER=${TARGET_SPOKE_CLUSTER}" +echo "TARGET_SPOKE_SNO=${TARGET_SPOKE_SNO}" echo "ECO_GOTESTS_FEATURES=${ECO_GOTESTS_FEATURES}" echo "MIRROR_REGISTRY=${MIRROR_REGISTRY}" echo "VERSION=${VERSION}" @@ -93,12 +93,12 @@ cd /eco-ci-cd ansible-playbook playbooks/ran/ibu-prepare-spoke-sno.yml \ -i "${OCP_DEPLOYMENT_INVENTORY_PATH}/build-inventory.py" \ --extra-vars "hub_cluster=${TARGET_CLUSTER_NAME}" \ - --extra-vars "spoke_cluster=${TARGET_SPOKE_CLUSTER}" \ + --extra-vars "spoke_cluster=${TARGET_SPOKE_SNO}" \ --extra-vars "seed_vm_name=${TARGET_VM_NAME}" echo "" echo "=== Step 2: Run eco-gotests IBU upgrade suite ===" -TARGET_SPOKE_KUBECONFIG="/tmp/${TARGET_SPOKE_CLUSTER}-kubeconfig" +TARGET_SPOKE_KUBECONFIG="/tmp/${TARGET_SPOKE_SNO}-kubeconfig" # Build eco-gotests environment variables ECO_GOTESTS_ENV_VARS="-e ECO_CNF_RAN_SKIP_TLS_VERIFY=true" diff --git a/ci-operator/step-registry/telcov10n/functional/cnf-ran/ibu-eco-gotests-upgrade/telcov10n-functional-cnf-ran-ibu-eco-gotests-upgrade-ref.yaml b/ci-operator/step-registry/telcov10n/functional/cnf-ran/ibu-eco-gotests-upgrade/telcov10n-functional-cnf-ran-ibu-eco-gotests-upgrade-ref.yaml index f19a0471ef53e..869dc70465a9c 100644 --- a/ci-operator/step-registry/telcov10n/functional/cnf-ran/ibu-eco-gotests-upgrade/telcov10n-functional-cnf-ran-ibu-eco-gotests-upgrade-ref.yaml +++ b/ci-operator/step-registry/telcov10n/functional/cnf-ran/ibu-eco-gotests-upgrade/telcov10n-functional-cnf-ran-ibu-eco-gotests-upgrade-ref.yaml @@ -30,7 +30,9 @@ ref: - name: TARGET_CLUSTER_NAME default: "kni-qe-109" documentation: Target hub cluster name (manages target spoke clusters via ACM) - - name: TARGET_SPOKE_CLUSTER + # Plain name (ibu-target). Do not use TARGET_SPOKE_CLUSTER — job sets that + # to ['ibu-target'] for ZTP. Same pattern as SEED_SPOKE_CLUSTER vs SPOKE_CLUSTER. + - name: TARGET_SPOKE_SNO default: "ibu-target" documentation: Target spoke SNO cluster name (the cluster being upgraded via IBU) - name: ECO_GOTESTS_FEATURES