Skip to content

Refactor nto lanes #79374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
May 18, 2026
Merged

Refactor nto lanes #79374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 32 additions & 62 deletions ...e-nto/cleanup-old-clusters/telcov10n-functional-compute-nto-cleanup-old-clusters-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ref:
timeout: 1h0m0s
resources:
requests:
cpu: 100m
cpu: 200m
env:
- name: CLUSTER_NAME
default: ""
Expand All @@ -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
Expand Down Expand Up @@ -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
1 change: 1 addition & 0 deletions ...lcov10n/functional/compute-nto/config/telcov10n-functional-compute-nto-config-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
8 changes: 5 additions & 3 deletions ...nctional/compute-nto/eco-gotests/telcov10n-functional-compute-nto-eco-gotests-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Comment on lines +113 to +115
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot May 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Make runner-script artifact copy non-fatal.

At Line 114, scp runs under set -e, so a missing/temporarily unreachable bastion or missing remote file can fail the whole step even though this artifact is auxiliary. Please handle this copy as best-effort with a warning.

Suggested patch 
 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"
+if ! scp -r -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i "${PROJECT_DIR}/temp_ssh_key" \
+    "${BASTION_USER}@${BASTION_IP}":/tmp/gotest/run_gotests.sh "${ARTIFACT_DIR}/run_gotests.sh"; then
+  echo "[WARNING] Could not copy /tmp/gotest/run_gotests.sh from bastion"
+fi
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
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 eco Gotest script to artifacts directory"
if ! scp -r -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i "${PROJECT_DIR}/temp_ssh_key" \
"${BASTION_USER}@${BASTION_IP}":/tmp/gotest/run_gotests.sh "${ARTIFACT_DIR}/run_gotests.sh"; then
echo "[WARNING] Could not copy /tmp/gotest/run_gotests.sh from bastion"
fi
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@ci-operator/step-registry/telcov10n/functional/compute-nto/eco-gotests/telcov10n-functional-compute-nto-eco-gotests-commands.sh`
around lines 113 - 115, Make the artifact copy of run_gotests.sh best-effort:
the scp command that uses
"${BASTION_USER}@${BASTION_IP}":/tmp/gotest/run_gotests.sh ->
"${ARTIFACT_DIR}/run_gotests.sh" should not abort the whole script under set -e;
change the invocation so failures are trapped and only emit a warning (e.g., run
scp and if it fails, echo a clear warning including BASTION_IP/ARTIFACT_DIR and
continue), or temporarily disable errexit around that scp invocation and restore
it afterward; ensure the warning includes the scp exit code or message so
troubleshooting is possible.


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/"

Expand All @@ -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
Expand Down
7 changes: 1 addition & 6 deletions ...functional/compute-nto/ocp-deploy/telcov10n-functional-compute-nto-ocp-deploy-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
95 changes: 34 additions & 61 deletions ...0n/functional/compute-nto/ocp-deploy/telcov10n-functional-compute-nto-ocp-deploy-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ref:
timeout: 3h0m0s
resources:
requests:
cpu: 100m
cpu: 500m
env:
- name: VERSION
default: "4.18"
Expand All @@ -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
Expand Down Expand Up @@ -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
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