From e6da6749be6e5143855a48c866de2cd03789d2e8 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Tue, 25 Apr 2017 19:29:36 +0800 Subject: Merge workspace files into one folder Change-Id: Ie8d0e8fdd6d6c212701ba1ee10b1d05da1ccca22 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 deletions(-) delete mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/fixtures/case.json delete mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/fixtures/pod.json delete mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/fixtures/project.json delete mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/group_vars/.gitkeep delete mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep delete mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/run.yml delete mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/setup.yml delete mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml delete mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts delete 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 deleted file mode 100644 index 22abc40f..00000000 --- a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/case.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "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 deleted file mode 100644 index 654b5828..00000000 --- a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/pod.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index ecd03e83..00000000 --- a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/project.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "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 deleted file mode 100644 index e69de29b..00000000 diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep b/resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/run.yml b/resources/ansible_roles/qtip-workspace/files/defaults/run.yml deleted file mode 100644 index 41df913b..00000000 --- a/resources/ansible_roles/qtip-workspace/files/defaults/run.yml +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################## -# 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 deleted file mode 100644 index a522d67b..00000000 --- a/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################## -# 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 deleted file mode 100644 index 4d51b64f..00000000 --- a/resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################## -# 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 deleted file mode 100644 index 6779d6f4..00000000 --- a/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index 6c8968d3..00000000 --- a/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg +++ /dev/null @@ -1,14 +0,0 @@ -# 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