From 855d8e256f2a408da51aa70932332eff4b0b36c9 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 28 Jan 2022 16:16:34 +0100
Subject: [PATCH] chore: double wait time for SSH (#2066) (#2069)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: dible wait time for SSH

It seems that for CentOS machines, SSH takes more than 1min to come

* chore: use multiline

* chore: include OpenTelemetry traces for Ansible

(cherry picked from commit a176d63d412c707e9f689aa10a6e92143eca4bb6)

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
---
 .ci/Jenkinsfile                    | 4 +++-
 .ci/ansible/ansible.cfg            | 2 ++
 .ci/ansible/tasks/wait_for_ssh.yml | 6 +++++-
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 .ci/ansible/ansible.cfg

diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index ec4b2a0fa7..972ce020b9 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -381,7 +381,9 @@ def getMachineInfo(workspace, platform){
 }
 
 def ansible(workspace, run_id, args){
-     pyrun("ansible-playbook --private-key=\"${workspace}/e2essh\" --extra-vars=\"workspace=${workspace}/ runId=${run_id} sshPublicKey=${workspace}/e2essh.pub\" --ssh-common-args='-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' ${workspace}/.ci/ansible/playbook.yml ${args}")
+  withOtelEnv() {
+    pyrun("ansible-playbook --private-key=\"${workspace}/e2essh\" --extra-vars=\"workspace=${workspace}/ runId=${run_id} sshPublicKey=${workspace}/e2essh.pub\" --ssh-common-args='-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' ${workspace}/.ci/ansible/playbook.yml ${args}")
+  }
 }
 
 
diff --git a/.ci/ansible/ansible.cfg b/.ci/ansible/ansible.cfg
new file mode 100644
index 0000000000..f394c17c0b
--- /dev/null
+++ b/.ci/ansible/ansible.cfg
@@ -0,0 +1,2 @@
+[defaults]
+callbacks_enabled = community.general.opentelemetry
diff --git a/.ci/ansible/tasks/wait_for_ssh.yml b/.ci/ansible/tasks/wait_for_ssh.yml
index 3a3d7ed61e..f0e66a082a 100644
--- a/.ci/ansible/tasks/wait_for_ssh.yml
+++ b/.ci/ansible/tasks/wait_for_ssh.yml
@@ -1,3 +1,7 @@
 ---
 - name: Wait for SSH to come up
-  wait_for: host={{ inventory_hostname }} port=22 delay=10 timeout=60
+  wait_for:
+    host: "{{ inventory_hostname }}"
+    port: 22
+    delay: 10
+    timeout: 120