From c13e2235e6603308761dc21126eb9a42d1dbc32a Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Sat, 30 Sep 2023 14:04:58 -0400 Subject: [PATCH] qa-dev: Dump tunnel IP before mesh test results This will make it easier to know which node the results correspond to. The current output shows the node's public IP, which is difficult to correlate when looking at the logs. Signed-off-by: Russell Bryant --- .github/workflows/qa-dev.yml | 2 +- ops/ansible/aws/validate-connectivity/tasks/main.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qa-dev.yml b/.github/workflows/qa-dev.yml index 812fcff4c..6945ead21 100644 --- a/.github/workflows/qa-dev.yml +++ b/.github/workflows/qa-dev.yml @@ -135,7 +135,7 @@ jobs: set -e /bin/sh -c 'cat ./ops/ansible/aws/*-connectivity-results.txt > ./ops/ansible/aws/mesh-connectivity-results.txt' cat ./ops/ansible/aws/mesh-connectivity-results.txt - if grep -iq 'Unreachable' ./ops/ansible/aws/*-connectivity-results.txt || grep -iq 'Failed' ./ops/ansible/aws/mesh-connectivity-results.txt; then + if grep -iq 'Unreachable' ./ops/ansible/aws/mesh-connectivity-results.txt || grep -iq 'Failed' ./ops/ansible/aws/mesh-connectivity-results.txt; then echo "Connectivity results contain 'Unreachable or Failed' nodes, check the connectivity results and artifacts for details. Failing the job" exit 1 else diff --git a/ops/ansible/aws/validate-connectivity/tasks/main.yml b/ops/ansible/aws/validate-connectivity/tasks/main.yml index 8e3333883..ace26f4fb 100644 --- a/ops/ansible/aws/validate-connectivity/tasks/main.yml +++ b/ops/ansible/aws/validate-connectivity/tasks/main.yml @@ -29,6 +29,8 @@ become: yes shell: | printf "====== Connectivity Results from Node: {{ inventory_hostname }} ======\n" > {{ inventory_hostname }}-connectivity-results.txt + printf "IPv4 tunnel IP: " + nexctl nexd get tunnelip nexctl nexd peers ping nexctl nexd peers ping >> {{ inventory_hostname }}-connectivity-results.txt 2>&1 nexctl nexd peers ping6 >> {{ inventory_hostname }}-connectivity-results.txt 2>&1