From da9215c46afcec88576c0f6e185802407122dea9 Mon Sep 17 00:00:00 2001 From: Eran Ifrach Date: Sun, 17 May 2026 13:58:47 +0300 Subject: [PATCH] Refactor NTO job Signed-off-by: Eran Ifrach --- ...-compute-nto-cleanup-old-clusters-ref.yaml | 94 +++++++----------- ...-functional-compute-nto-config-commands.sh | 1 + ...tional-compute-nto-eco-gotests-commands.sh | 8 +- ...ctional-compute-nto-ocp-deploy-commands.sh | 7 +- ...functional-compute-nto-ocp-deploy-ref.yaml | 95 +++++++------------ 5 files changed, 73 insertions(+), 132 deletions(-) diff --git a/ci-operator/step-registry/telcov10n/functional/compute-nto/cleanup-old-clusters/telcov10n-functional-compute-nto-cleanup-old-clusters-ref.yaml b/ci-operator/step-registry/telcov10n/functional/compute-nto/cleanup-old-clusters/telcov10n-functional-compute-nto-cleanup-old-clusters-ref.yaml index 6d0113d49541d..bc8e8355582a9 100644 --- a/ci-operator/step-registry/telcov10n/functional/compute-nto/cleanup-old-clusters/telcov10n-functional-compute-nto-cleanup-old-clusters-ref.yaml +++ b/ci-operator/step-registry/telcov10n/functional/compute-nto/cleanup-old-clusters/telcov10n-functional-compute-nto-cleanup-old-clusters-ref.yaml @@ -8,7 +8,7 @@ ref: timeout: 1h0m0s resources: requests: - cpu: 100m + cpu: 200m env: - name: CLUSTER_NAME default: "" @@ -24,67 +24,6 @@ ref: name: telcov10n-ansible-group-hypervisors mount_path: /var/group_variables/common/hypervisors - - namespace: test-credentials - name: telcov10n-ansible-group-hlxcl51-masters - mount_path: /var/group_variables/hlxcl51/masters - - namespace: test-credentials - name: telcov10n-ansible-group-hlxcl51-workers - mount_path: /var/group_variables/hlxcl51/workers - - namespace: test-credentials - name: telcov10n-ansible-group-hlxcl51-nodes - mount_path: /var/group_variables/hlxcl51/nodes - - namespace: test-credentials - name: telcov10n-ansible-hlxcl51-bastion - mount_path: /var/host_variables/hlxcl51/bastion - - namespace: test-credentials - name: telcov10n-ansible-hlxcl51-master0 - mount_path: /var/host_variables/hlxcl51/master0 - - namespace: test-credentials - name: telcov10n-ansible-hlxcl51-master1 - mount_path: /var/host_variables/hlxcl51/master1 - - namespace: test-credentials - name: telcov10n-ansible-hlxcl51-master2 - mount_path: /var/host_variables/hlxcl51/master2 - - namespace: test-credentials - name: telcov10n-ansible-hlxcl51-worker0 - mount_path: /var/host_variables/hlxcl51/worker0 - - namespace: test-credentials - name: telcov10n-ansible-hlxcl51-worker1 - mount_path: /var/host_variables/hlxcl51/worker1 - - namespace: test-credentials - name: telcov10n-ansible-hypervisors-ocp-hlxcl51 - mount_path: /var/host_variables/hlxcl51/hypervisor - - namespace: test-credentials - name: telcov10n-ansible-group-hlxcl52-masters - mount_path: /var/group_variables/hlxcl52/masters - - namespace: test-credentials - name: telcov10n-ansible-group-hlxcl52-workers - mount_path: /var/group_variables/hlxcl52/workers - - namespace: test-credentials - name: telcov10n-ansible-group-hlxcl52-nodes - mount_path: /var/group_variables/hlxcl52/nodes - - namespace: test-credentials - name: telcov10n-ansible-hlxcl52-bastion - mount_path: /var/host_variables/hlxcl52/bastion - - namespace: test-credentials - name: telcov10n-ansible-hlxcl52-master0 - mount_path: /var/host_variables/hlxcl52/master0 - - namespace: test-credentials - name: telcov10n-ansible-hlxcl52-master1 - mount_path: /var/host_variables/hlxcl52/master1 - - namespace: test-credentials - name: telcov10n-ansible-hlxcl52-master2 - mount_path: /var/host_variables/hlxcl52/master2 - - namespace: test-credentials - name: telcov10n-ansible-hlxcl52-worker0 - mount_path: /var/host_variables/hlxcl52/worker0 - - namespace: test-credentials - name: telcov10n-ansible-hlxcl52-worker1 - mount_path: /var/host_variables/hlxcl52/worker1 - - namespace: test-credentials - name: telcov10n-ansible-hypervisors-ocp-hlxcl52 - mount_path: /var/host_variables/hlxcl52/hypervisor - - namespace: test-credentials name: telcov10n-ansible-group-hlxcl15-masters mount_path: /var/group_variables/hlxcl15/masters @@ -115,3 +54,34 @@ ref: - namespace: test-credentials name: telcov10n-ansible-hypervisors-ocp-edge91 mount_path: /var/host_variables/hlxcl15/hypervisor +# cluster helix17 + - namespace: test-credentials + name: telcov10n-ansible-group-helix17-masters + mount_path: /var/group_variables/helix17/masters + - namespace: test-credentials + name: telcov10n-ansible-group-helix17-workers + mount_path: /var/group_variables/helix17/workers + - namespace: test-credentials + name: telcov10n-ansible-group-helix17-nodes + mount_path: /var/group_variables/helix17/nodes + - namespace: test-credentials + name: telcov10n-ansible-helix17-bastion + mount_path: /var/host_variables/helix17/bastion + - namespace: test-credentials + name: telcov10n-ansible-helix17-master0 + mount_path: /var/host_variables/helix17/master0 + - namespace: test-credentials + name: telcov10n-ansible-helix17-master1 + mount_path: /var/host_variables/helix17/master1 + - namespace: test-credentials + name: telcov10n-ansible-helix17-master2 + mount_path: /var/host_variables/helix17/master2 + - namespace: test-credentials + name: telcov10n-ansible-helix17-worker0 + mount_path: /var/host_variables/helix17/worker0 + - namespace: test-credentials + name: telcov10n-ansible-helix17-worker1 + mount_path: /var/host_variables/helix17/worker1 + - namespace: test-credentials + name: telcov10n-ansible-hypervisors-ocp-edge92 + mount_path: /var/host_variables/helix17/hypervisor diff --git a/ci-operator/step-registry/telcov10n/functional/compute-nto/config/telcov10n-functional-compute-nto-config-commands.sh b/ci-operator/step-registry/telcov10n/functional/compute-nto/config/telcov10n-functional-compute-nto-config-commands.sh index 5af697103e274..0f13cc0bc910c 100755 --- a/ci-operator/step-registry/telcov10n/functional/compute-nto/config/telcov10n-functional-compute-nto-config-commands.sh +++ b/ci-operator/step-registry/telcov10n/functional/compute-nto/config/telcov10n-functional-compute-nto-config-commands.sh @@ -83,6 +83,7 @@ fi echo "Running ansible-playbook with extra vars: ${EXTRA_VARS}" export ANSIBLE_REMOTE_TEMP="/tmp" + ansible-playbook ./playbooks/compute/config-cluster.yml -i ./inventories/ocp-deployment/build-inventory.py \ --extra-vars "${EXTRA_VARS}" diff --git a/ci-operator/step-registry/telcov10n/functional/compute-nto/eco-gotests/telcov10n-functional-compute-nto-eco-gotests-commands.sh b/ci-operator/step-registry/telcov10n/functional/compute-nto/eco-gotests/telcov10n-functional-compute-nto-eco-gotests-commands.sh index daf2975851583..a09ef0221ee0e 100755 --- a/ci-operator/step-registry/telcov10n/functional/compute-nto/eco-gotests/telcov10n-functional-compute-nto-eco-gotests-commands.sh +++ b/ci-operator/step-registry/telcov10n/functional/compute-nto/eco-gotests/telcov10n-functional-compute-nto-eco-gotests-commands.sh @@ -110,6 +110,11 @@ if [[ $ssh_ret -ne 0 ]]; then echo fi +echo "Copy eco Gotest script to artifacts directory" +scp -r -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /tmp/temp_ssh_key \ + "${BASTION_USER}@${BASTION_IP}":/tmp/gotest/run_gotests.sh "${ARTIFACT_DIR}/run_gotests.sh" + +echo "Copy junit test reports to artifacts directory" scp -r -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${PROJECT_DIR}/temp_ssh_key \ "${BASTION_USER}@${BASTION_IP}":"${REPORT_DIR}/*.xml" "${ARTIFACT_DIR}/junit_eco_gotests/" @@ -125,9 +130,6 @@ for xml_file in "${ARTIFACT_DIR}"/junit_eco_gotests/*.xml; do fi done -ls -la "${ARTIFACT_DIR}"/junit_eco_gotests/*.xml - - if ls ${ARTIFACT_DIR}/junit_eco_gotests/*.xml 1> /dev/null 2>&1; then echo "Copy junit test reports to shared directory for reporter step" cp -v "${ARTIFACT_DIR}"/junit_eco_gotests/*.xml "${SHARED_DIR}/" 2>/dev/null diff --git a/ci-operator/step-registry/telcov10n/functional/compute-nto/ocp-deploy/telcov10n-functional-compute-nto-ocp-deploy-commands.sh b/ci-operator/step-registry/telcov10n/functional/compute-nto/ocp-deploy/telcov10n-functional-compute-nto-ocp-deploy-commands.sh index ba3ab42294660..edeec892a6f35 100755 --- a/ci-operator/step-registry/telcov10n/functional/compute-nto/ocp-deploy/telcov10n-functional-compute-nto-ocp-deploy-commands.sh +++ b/ci-operator/step-registry/telcov10n/functional/compute-nto/ocp-deploy/telcov10n-functional-compute-nto-ocp-deploy-commands.sh @@ -69,12 +69,7 @@ main() { done cd /eco-ci-cd - - echo "Clean old clusters" - ansible-playbook ./playbooks/compute/delete_old_clusters.yml \ - -e "cluster_name=${CLUSTER_NAME}" \ - -i ./inventories/ocp-deployment/build-inventory.py - + echo "Deploy OCP for compute-nto testing" ansible-playbook ./playbooks/deploy-ocp-hybrid-multinode.yml \ -i ./inventories/ocp-deployment/build-inventory.py \ diff --git a/ci-operator/step-registry/telcov10n/functional/compute-nto/ocp-deploy/telcov10n-functional-compute-nto-ocp-deploy-ref.yaml b/ci-operator/step-registry/telcov10n/functional/compute-nto/ocp-deploy/telcov10n-functional-compute-nto-ocp-deploy-ref.yaml index 3d41f3fd6bfe3..e9e606590dbd0 100644 --- a/ci-operator/step-registry/telcov10n/functional/compute-nto/ocp-deploy/telcov10n-functional-compute-nto-ocp-deploy-ref.yaml +++ b/ci-operator/step-registry/telcov10n/functional/compute-nto/ocp-deploy/telcov10n-functional-compute-nto-ocp-deploy-ref.yaml @@ -8,7 +8,7 @@ ref: timeout: 3h0m0s resources: requests: - cpu: 100m + cpu: 500m env: - name: VERSION default: "4.18" @@ -33,65 +33,7 @@ ref: - namespace: test-credentials name: telcov10n-ansible-group-hypervisors mount_path: /var/group_variables/common/hypervisors - - - namespace: test-credentials - name: telcov10n-ansible-group-hlxcl51-sno-masters - mount_path: /var/group_variables/hlxcl51-sno/masters - - namespace: test-credentials - name: telcov10n-ansible-group-hlxcl51-sno-nodes - mount_path: /var/group_variables/hlxcl51-sno/nodes - - namespace: test-credentials - name: telcov10n-ansible-hlxcl51-sno-bastion - mount_path: /var/host_variables/hlxcl51-sno/bastion - - namespace: test-credentials - name: telcov10n-ansible-hlxcl51-sno-master0 - mount_path: /var/host_variables/hlxcl51-sno/master0 - - namespace: test-credentials - name: telcov10n-ansible-group-hlxcl52-sno-masters - mount_path: /var/group_variables/hlxcl52-sno/masters - - namespace: test-credentials - name: telcov10n-ansible-group-hlxcl52-sno-nodes - mount_path: /var/group_variables/hlxcl52-sno/nodes - - namespace: test-credentials - name: telcov10n-ansible-hlxcl52-sno-bastion - mount_path: /var/host_variables/hlxcl52-sno/bastion - - namespace: test-credentials - name: telcov10n-ansible-hlxcl52-sno-master0 - mount_path: /var/host_variables/hlxcl52-sno/master0 - - namespace: test-credentials - name: telcov10n-ansible-hypervisors-ocp-hlxcl51 - mount_path: /var/host_variables/hlxcl51-sno/hypervisor - - namespace: test-credentials - name: telcov10n-ansible-group-hlxcl52-masters - mount_path: /var/group_variables/hlxcl52/masters - - namespace: test-credentials - name: telcov10n-ansible-group-hlxcl52-workers - mount_path: /var/group_variables/hlxcl52/workers - - namespace: test-credentials - name: telcov10n-ansible-group-hlxcl52-nodes - mount_path: /var/group_variables/hlxcl52/nodes - - namespace: test-credentials - name: telcov10n-ansible-hlxcl52-bastion - mount_path: /var/host_variables/hlxcl52/bastion - - namespace: test-credentials - name: telcov10n-ansible-hlxcl52-master0 - mount_path: /var/host_variables/hlxcl52/master0 - - namespace: test-credentials - name: telcov10n-ansible-hlxcl52-master1 - mount_path: /var/host_variables/hlxcl52/master1 - - namespace: test-credentials - name: telcov10n-ansible-hlxcl52-master2 - mount_path: /var/host_variables/hlxcl52/master2 - - namespace: test-credentials - name: telcov10n-ansible-hlxcl52-worker0 - mount_path: /var/host_variables/hlxcl52/worker0 - - namespace: test-credentials - name: telcov10n-ansible-hlxcl52-worker1 - mount_path: /var/host_variables/hlxcl52/worker1 - - namespace: test-credentials - name: telcov10n-ansible-hypervisors-ocp-hlxcl52 - mount_path: /var/host_variables/hlxcl52/hypervisor - +# cluster hlxcl15 - namespace: test-credentials name: telcov10n-ansible-group-hlxcl15-masters mount_path: /var/group_variables/hlxcl15/masters @@ -121,4 +63,35 @@ ref: mount_path: /var/host_variables/hlxcl15/worker1 - namespace: test-credentials name: telcov10n-ansible-hypervisors-ocp-edge91 - mount_path: /var/host_variables/hlxcl15/hypervisor \ No newline at end of file + mount_path: /var/host_variables/hlxcl15/hypervisor +# cluster helix17 + - namespace: test-credentials + name: telcov10n-ansible-group-helix17-masters + mount_path: /var/group_variables/helix17/masters + - namespace: test-credentials + name: telcov10n-ansible-group-helix17-workers + mount_path: /var/group_variables/helix17/workers + - namespace: test-credentials + name: telcov10n-ansible-group-helix17-nodes + mount_path: /var/group_variables/helix17/nodes + - namespace: test-credentials + name: telcov10n-ansible-helix17-bastion + mount_path: /var/host_variables/helix17/bastion + - namespace: test-credentials + name: telcov10n-ansible-helix17-master0 + mount_path: /var/host_variables/helix17/master0 + - namespace: test-credentials + name: telcov10n-ansible-helix17-master1 + mount_path: /var/host_variables/helix17/master1 + - namespace: test-credentials + name: telcov10n-ansible-helix17-master2 + mount_path: /var/host_variables/helix17/master2 + - namespace: test-credentials + name: telcov10n-ansible-helix17-worker0 + mount_path: /var/host_variables/helix17/worker0 + - namespace: test-credentials + name: telcov10n-ansible-helix17-worker1 + mount_path: /var/host_variables/helix17/worker1 + - namespace: test-credentials + name: telcov10n-ansible-hypervisors-ocp-edge92 + mount_path: /var/host_variables/helix17/hypervisor \ No newline at end of file