From 226046764b2735c57f44a80f6e9921a509b8322b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Fri, 28 Jan 2022 10:59:29 +0100 Subject: [PATCH 1/3] chore: dible wait time for SSH It seems that for CentOS machines, SSH takes more than 1min to come --- .ci/ansible/tasks/wait_for_ssh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/ansible/tasks/wait_for_ssh.yml b/.ci/ansible/tasks/wait_for_ssh.yml index 3a3d7ed61e..0f3b82ded4 100644 --- a/.ci/ansible/tasks/wait_for_ssh.yml +++ b/.ci/ansible/tasks/wait_for_ssh.yml @@ -1,3 +1,3 @@ --- - 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 From f1f7147d56baf9de65a423cfe6fe5af6442e9a8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Fri, 28 Jan 2022 12:37:18 +0100 Subject: [PATCH 2/3] chore: use multiline --- .ci/ansible/tasks/wait_for_ssh.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.ci/ansible/tasks/wait_for_ssh.yml b/.ci/ansible/tasks/wait_for_ssh.yml index 0f3b82ded4..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=120 + wait_for: + host: "{{ inventory_hostname }}" + port: 22 + delay: 10 + timeout: 120 From 683ec766a2fe1b1e771a9cc358422f0015e38456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Fri, 28 Jan 2022 12:39:01 +0100 Subject: [PATCH 3/3] chore: include OpenTelemetry traces for Ansible --- .ci/Jenkinsfile | 4 +++- .ci/ansible/ansible.cfg | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .ci/ansible/ansible.cfg diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index ca0f559243..c5543e7993 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