From b0ffc4e209e5d4fbd697ca39f7b536dbe2ea7993 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Sat, 1 Sep 2018 15:04:32 +0100 Subject: [PATCH] Copy random test setup changes out of linear2 branch. --- tests/ansible/.gitignore | 1 + tests/ansible/ansible.cfg | 2 +- tests/ansible/gcloud/controller.yml | 18 ++++ tests/ansible/gcloud/hosts | 2 +- tests/ansible/gcloud/templates/ansible.cfg.j2 | 19 ++++ tests/ansible/gcloud/templates/ssh_config.j2 | 6 ++ tests/ansible/hosts.docker | 100 ------------------ tests/ansible/hosts/connection-delegation | 12 +++ tests/ansible/hosts/localhost | 12 +++ tests/ansible/lib/inventory/gcloud.py | 2 +- 10 files changed, 71 insertions(+), 103 deletions(-) create mode 100644 tests/ansible/gcloud/templates/ansible.cfg.j2 create mode 100644 tests/ansible/gcloud/templates/ssh_config.j2 delete mode 100644 tests/ansible/hosts.docker create mode 100644 tests/ansible/hosts/connection-delegation diff --git a/tests/ansible/.gitignore b/tests/ansible/.gitignore index 1ea0ada7..8d473777 100644 --- a/tests/ansible/.gitignore +++ b/tests/ansible/.gitignore @@ -1,2 +1,3 @@ lib/modules/custom_binary_producing_junk lib/modules/custom_binary_producing_json +hosts/*.local diff --git a/tests/ansible/ansible.cfg b/tests/ansible/ansible.cfg index ff7ab25b..68c3ad19 100644 --- a/tests/ansible/ansible.cfg +++ b/tests/ansible/ansible.cfg @@ -10,7 +10,7 @@ library = lib/modules module_utils = lib/module_utils retry_files_enabled = False display_args_to_stdout = True -forks = 50 +forks = 200 # Required by integration/ssh/timeouts.yml timeout = 10 diff --git a/tests/ansible/gcloud/controller.yml b/tests/ansible/gcloud/controller.yml index f7989ddf..494c2164 100644 --- a/tests/ansible/gcloud/controller.yml +++ b/tests/ansible/gcloud/controller.yml @@ -5,6 +5,24 @@ git_email: '{{ lookup("pipe", "git config --global user.email") }}' tasks: + - lineinfile: + line: "{{item}}" + path: /etc/sysctl.conf + register: sysctl_conf + become: true + with_items: + - "net.ipv4.ip_forward=1" + - "kernel.perf_event_paranoid=-1" + + - copy: + src: ~/.ssh/id_gitlab + dest: ~/.ssh/id_gitlab + mode: 0600 + + - template: + dest: ~/.ssh/config + src: ssh_config.j2 + - lineinfile: line: "net.ipv4.ip_forward=1" path: /etc/sysctl.conf diff --git a/tests/ansible/gcloud/hosts b/tests/ansible/gcloud/hosts index b4562cb5..453320e6 100644 --- a/tests/ansible/gcloud/hosts +++ b/tests/ansible/gcloud/hosts @@ -1,2 +1,2 @@ [controller] -35.206.145.240 +c diff --git a/tests/ansible/gcloud/templates/ansible.cfg.j2 b/tests/ansible/gcloud/templates/ansible.cfg.j2 new file mode 100644 index 00000000..aa31c571 --- /dev/null +++ b/tests/ansible/gcloud/templates/ansible.cfg.j2 @@ -0,0 +1,19 @@ +[defaults] +inventory = hosts,~/mitogen/tests/ansible/lib/inventory +gathering = explicit +strategy_plugins = ~/mitogen/ansible_mitogen/plugins/strategy +action_plugins = ~/mitogen/tests/ansible/lib/action +callback_plugins = ~/mitogen/tests/ansible/lib/callback +stdout_callback = nice_stdout +vars_plugins = ~/mitogen/tests/ansible/lib/vars +library = ~/mitogen/tests/ansible/lib/modules +retry_files_enabled = False +forks = 50 + +strategy = mitogen_linear + +host_key_checking = False + +[ssh_connection] +ssh_args = -o ForwardAgent=yes -o ControlMaster=auto -o ControlPersist=60s +pipelining = True diff --git a/tests/ansible/gcloud/templates/ssh_config.j2 b/tests/ansible/gcloud/templates/ssh_config.j2 new file mode 100644 index 00000000..2a65bfe7 --- /dev/null +++ b/tests/ansible/gcloud/templates/ssh_config.j2 @@ -0,0 +1,6 @@ + +Host localhost-* + Hostname localhost + +Host gitlab.com + IdentityFile ~/.ssh/id_gitlab diff --git a/tests/ansible/hosts.docker b/tests/ansible/hosts.docker deleted file mode 100644 index 01a2aff7..00000000 --- a/tests/ansible/hosts.docker +++ /dev/null @@ -1,100 +0,0 @@ -mydeb9-1 ansible_connection=docker -mydeb9-2 ansible_connection=docker -mydeb9-3 ansible_connection=docker -mydeb9-4 ansible_connection=docker -mydeb9-5 ansible_connection=docker -mydeb9-6 ansible_connection=docker -mydeb9-7 ansible_connection=docker -mydeb9-8 ansible_connection=docker -mydeb9-9 ansible_connection=docker -mydeb9-10 ansible_connection=docker -mydeb9-11 ansible_connection=docker -mydeb9-12 ansible_connection=docker -mydeb9-13 ansible_connection=docker -mydeb9-14 ansible_connection=docker -mydeb9-15 ansible_connection=docker -mydeb9-16 ansible_connection=docker -mydeb9-17 ansible_connection=docker -mydeb9-18 ansible_connection=docker -mydeb9-19 ansible_connection=docker -mydeb9-20 ansible_connection=docker -mydeb9-21 ansible_connection=docker -mydeb9-22 ansible_connection=docker -mydeb9-23 ansible_connection=docker -mydeb9-24 ansible_connection=docker -mydeb9-25 ansible_connection=docker -mydeb9-26 ansible_connection=docker -mydeb9-27 ansible_connection=docker -mydeb9-28 ansible_connection=docker -mydeb9-29 ansible_connection=docker -mydeb9-30 ansible_connection=docker -mydeb9-31 ansible_connection=docker -mydeb9-32 ansible_connection=docker -mydeb9-33 ansible_connection=docker -mydeb9-34 ansible_connection=docker -mydeb9-35 ansible_connection=docker -mydeb9-36 ansible_connection=docker -mydeb9-37 ansible_connection=docker -mydeb9-38 ansible_connection=docker -mydeb9-39 ansible_connection=docker -mydeb9-40 ansible_connection=docker -mydeb9-41 ansible_connection=docker -mydeb9-42 ansible_connection=docker -mydeb9-43 ansible_connection=docker -mydeb9-44 ansible_connection=docker -mydeb9-45 ansible_connection=docker -mydeb9-46 ansible_connection=docker -mydeb9-47 ansible_connection=docker -mydeb9-48 ansible_connection=docker -mydeb9-49 ansible_connection=docker -mydeb9-50 ansible_connection=docker -mydeb9-51 ansible_connection=docker -mydeb9-52 ansible_connection=docker -mydeb9-53 ansible_connection=docker -mydeb9-54 ansible_connection=docker -mydeb9-55 ansible_connection=docker -mydeb9-56 ansible_connection=docker -mydeb9-57 ansible_connection=docker -mydeb9-58 ansible_connection=docker -mydeb9-59 ansible_connection=docker -mydeb9-60 ansible_connection=docker -mydeb9-61 ansible_connection=docker -mydeb9-62 ansible_connection=docker -mydeb9-63 ansible_connection=docker -mydeb9-64 ansible_connection=docker -mydeb9-65 ansible_connection=docker -mydeb9-66 ansible_connection=docker -mydeb9-67 ansible_connection=docker -mydeb9-68 ansible_connection=docker -mydeb9-69 ansible_connection=docker -mydeb9-70 ansible_connection=docker -mydeb9-71 ansible_connection=docker -mydeb9-72 ansible_connection=docker -mydeb9-73 ansible_connection=docker -mydeb9-74 ansible_connection=docker -mydeb9-75 ansible_connection=docker -mydeb9-76 ansible_connection=docker -mydeb9-77 ansible_connection=docker -mydeb9-78 ansible_connection=docker -mydeb9-79 ansible_connection=docker -mydeb9-80 ansible_connection=docker -mydeb9-81 ansible_connection=docker -mydeb9-82 ansible_connection=docker -mydeb9-83 ansible_connection=docker -mydeb9-84 ansible_connection=docker -mydeb9-85 ansible_connection=docker -mydeb9-86 ansible_connection=docker -mydeb9-87 ansible_connection=docker -mydeb9-88 ansible_connection=docker -mydeb9-89 ansible_connection=docker -mydeb9-90 ansible_connection=docker -mydeb9-91 ansible_connection=docker -mydeb9-92 ansible_connection=docker -mydeb9-93 ansible_connection=docker -mydeb9-94 ansible_connection=docker -mydeb9-95 ansible_connection=docker -mydeb9-96 ansible_connection=docker -mydeb9-97 ansible_connection=docker -mydeb9-98 ansible_connection=docker -mydeb9-99 ansible_connection=docker -mydeb9-100 ansible_connection=docker diff --git a/tests/ansible/hosts/connection-delegation b/tests/ansible/hosts/connection-delegation new file mode 100644 index 00000000..2fb87455 --- /dev/null +++ b/tests/ansible/hosts/connection-delegation @@ -0,0 +1,12 @@ +[connection-delegation-test] +cd-bastion +cd-rack11 mitogen_via=ssh-user@cd-bastion +cd-rack11a mitogen_via=root@cd-rack11 +cd-rack11a-docker mitogen_via=docker-admin@cd-rack11a ansible_connection=docker + +[connection-delegation-cycle] +# Create cycle with Docker container. +cdc-bastion mitogen_via=cdc-rack11a-docker +cdc-rack11 mitogen_via=ssh-user@cdc-bastion +cdc-rack11a mitogen_via=root@cdc-rack11 +cdc-rack11a-docker mitogen_via=docker-admin@cdc-rack11a ansible_connection=docker diff --git a/tests/ansible/hosts/localhost b/tests/ansible/hosts/localhost index dc7df668..d656b43e 100644 --- a/tests/ansible/hosts/localhost +++ b/tests/ansible/hosts/localhost @@ -1,2 +1,14 @@ [test-targets] target ansible_host=localhost + +[localhost-x10] +localhost-1 +localhost-2 +localhost-3 +localhost-4 +localhost-5 +localhost-6 +localhost-7 +localhost-8 +localhost-9 +localhost-10 diff --git a/tests/ansible/lib/inventory/gcloud.py b/tests/ansible/lib/inventory/gcloud.py index 2135d913..73e083f4 100755 --- a/tests/ansible/lib/inventory/gcloud.py +++ b/tests/ansible/lib/inventory/gcloud.py @@ -14,7 +14,7 @@ import googleapiclient.discovery def main(): project = 'mitogen-load-testing' zone = 'europe-west1-d' - group_name = 'target' + group_name = 'micro-debian9' client = googleapiclient.discovery.build('compute', 'v1') resp = client.instances().list(project=project, zone=zone).execute()