From 94123240d9a33a571b3a8aaa2e7eaabc5b550bbb Mon Sep 17 00:00:00 2001 From: Jack Ivanov Date: Wed, 11 Dec 2019 17:46:26 +0100 Subject: [PATCH] remove ansible_ssh_user from the tests --- playbooks/cloud-post.yml | 2 +- tests/cloud-init.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/cloud-post.yml b/playbooks/cloud-post.yml index e871732..1495473 100644 --- a/playbooks/cloud-post.yml +++ b/playbooks/cloud-post.yml @@ -8,7 +8,7 @@ name: "{% if cloud_instance_ip == 'localhost' %}localhost{% else %}{{ cloud_instance_ip }}{% endif %}" groups: vpn-host ansible_connection: "{% if cloud_instance_ip == 'localhost' %}local{% else %}ssh{% endif %}" - ansible_ssh_user: "{{ ansible_ssh_user }}" + ansible_ssh_user: "{{ ansible_ssh_user|default('root') }}" ansible_ssh_port: "{{ ansible_ssh_port|default(22) }}" ansible_python_interpreter: "/usr/bin/python3" algo_provider: "{{ algo_provider }}" diff --git a/tests/cloud-init.sh b/tests/cloud-init.sh index a17e51e..f8de251 100755 --- a/tests/cloud-init.sh +++ b/tests/cloud-init.sh @@ -9,7 +9,7 @@ export DNS_ADBLOCKING=true export SSH_TUNNELING=true export ENDPOINT=10.0.8.100 export USERS=desktop,user1,user2 -export EXTRA_VARS='install_headers=false tests=true apparmor_enabled=false local_service_ip=172.16.0.1 ansible_ssh_user=4160' +export EXTRA_VARS='install_headers=false tests=true apparmor_enabled=false local_service_ip=172.16.0.1' export ANSIBLE_EXTRA_ARGS='--skip-tags apparmor' export REPO_SLUG=${TRAVIS_PULL_REQUEST_SLUG:-${TRAVIS_REPO_SLUG:-trailofbits/algo}} export REPO_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH:-master}}