Merge branch 'main' into fix-fleet-server-tokens

* main: chore: double wait time for SSH (elastic#2066)
mdelapenya · Jan 28, 2022 · 5cffc9f · 5cffc9f
2 parents ad87b88 + a176d63
commit 5cffc9f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[defaults]
		callbacks_enabled = community.general.opentelemetry