From 7a03b70c783828c7c17b4019c2cda295d31cf43f Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Thu, 27 Apr 2017 09:15:40 +0800 Subject: Revert "Merge workspace files into one folder" This reverts commit e6da6749be6e5143855a48c866de2cd03789d2e8. Change-Id: Ieac19a1526e7a5515923b8258079af3a1faaa56b Signed-off-by: Yujun Zhang --- .../files/defaults/fixtures/case.json | 14 +++++++ .../files/defaults/fixtures/pod.json | 6 +++ .../files/defaults/fixtures/project.json | 4 ++ .../files/defaults/group_vars/.gitkeep | 0 .../files/defaults/host_vars/.gitkeep | 0 .../qtip-workspace/files/defaults/run.yml | 45 ++++++++++++++++++++++ .../qtip-workspace/files/defaults/setup.yml | 17 ++++++++ .../qtip-workspace/files/defaults/teardown.yml | 19 +++++++++ .../qtip-workspace/files/defaults/templates/hosts | 20 ++++++++++ .../files/defaults/templates/ssh.cfg | 14 +++++++ 10 files changed, 139 insertions(+) create mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/fixtures/case.json create mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/fixtures/pod.json create mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/fixtures/project.json create mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/group_vars/.gitkeep create mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep create mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/run.yml create mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/setup.yml create mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml create mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts create mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg (limited to 'resources/ansible_roles/qtip-workspace/files/defaults') diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/case.json b/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/case.json new file mode 100644 index 00000000..22abc40f --- /dev/null +++ b/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/case.json @@ -0,0 +1,14 @@ +{ + "run": "", + "name": "compute", + "ci_loop": "", + "tags": "", + "url": "", + "domains": "", + "dependencies": "", + "version": "", + "criteria": "", + "tier": "", + "blocking": "", + "description": "" +} \ No newline at end of file diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/pod.json b/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/pod.json new file mode 100644 index 00000000..654b5828 --- /dev/null +++ b/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/pod.json @@ -0,0 +1,6 @@ +{ + "details": "", + "role": "", + "name": "qtip-pod", + "mode": "" +} \ No newline at end of file diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/project.json b/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/project.json new file mode 100644 index 00000000..ecd03e83 --- /dev/null +++ b/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/project.json @@ -0,0 +1,4 @@ +{ + "name": "qtip", + "description": "Platform Performance Benchmarking" +} \ No newline at end of file diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/group_vars/.gitkeep b/resources/ansible_roles/qtip-workspace/files/defaults/group_vars/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep b/resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/run.yml b/resources/ansible_roles/qtip-workspace/files/defaults/run.yml new file mode 100644 index 00000000..41df913b --- /dev/null +++ b/resources/ansible_roles/qtip-workspace/files/defaults/run.yml @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- + +- hosts: localhost + + roles: + # prepare local environment + - { role: qtip, tasks: setup-local, tags: [setup] } + + +- hosts: compute + + roles: + # prepare environment + - { role: qtip, tasks: setup-node, tags: [setup] } + + +- hosts: compute + + roles: + # run test and collect metrics + - { role: inxi, output: "{{ qtip_results }}/sysinfo", tags: [run, inxi, sysinfo] } + - { role: unixbench, output: "{{ qtip_results }}/arithmetic", tags: [run, unixbench, arithmetic] } + - { role: openssl, output: "{{ qtip_results }}/ssl", tags: [run, openssl, ssl] } + - { role: nDPI, output: "{{ qtip_results }}/dpi", tags: [run, ndpi, dpi] } + - { role: ramspeed, output: "{{ qtip_results }}/memory", tags: [run, ramspeed, memory] } + # calculate scores + - { role: qtip, tasks: calculate, tags: [calculate] } + + +- hosts: localhost + + roles: + # aggregate results and produce report + - { role: qtip, tasks: aggregate, tags: [aggregate] } + # publish results + - { role: opnfv-testapi, tasks: report, when: testapi_url is defined, tags: [report] } diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml b/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml new file mode 100644 index 00000000..a522d67b --- /dev/null +++ b/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml @@ -0,0 +1,17 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +# Prepare connection to SUT (System Under Test) + +--- + +- hosts: [fuel-masters, apex-underclouds] + gather_facts: no + roles: + - { role: qtip, tasks: generate-inventory } diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml b/resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml new file mode 100644 index 00000000..4d51b64f --- /dev/null +++ b/resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml @@ -0,0 +1,19 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +- hosts: compute + + vars_prompt: + - name: remove_workdir + prompt: "WARNING: remove work dir from system under test? (yes|no)" + default: no + + roles: + # teardown environment + - { role: qtip, tasks: teardown } diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts b/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts new file mode 100644 index 00000000..6779d6f4 --- /dev/null +++ b/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts @@ -0,0 +1,20 @@ +localhost ansible_connection=local + +[{{ installer_master_group[installer] }}] +{{ installer_master_host }} + +[fuel-groups:children] +{% for group in hosts|sort %} +{{ group }} +{% endfor %} + +[fuel-groups:vars] +ansible_ssh_common_args=-F ./ssh.cfg + +{% for group in hosts|sort %} +[{{ group }}] +{% for host in hosts[group]|sort %} +{{ host }} +{% endfor %} + +{% endfor %} diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg b/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg new file mode 100644 index 00000000..6c8968d3 --- /dev/null +++ b/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg @@ -0,0 +1,14 @@ +# Connect to target node through jump host +# +# OpenSSH 7.3: +# ProxyJump jumphost +# before OpenSSH 7.3 +# ProxyCommand ssh -o 'ForwardAgent yes' jumphost 'ssh-add && nc %h %p' + +{% for (name, host) in hosts_meta.items() %} +Host {{ name }} + HostName {{ host.ansible_ssh_host }} + User root + ProxyCommand ssh -o 'ForwardAgent yes' {{ installer_master_host }} 'ssh-add && nc %h %p' + +{% endfor %} -- cgit 1.2.3-korg