From 7455eb762165d336e81ca901885dc9b45fa7cced Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Wed, 19 Apr 2017 22:03:52 +0800 Subject: Create workspace by ansible playbook Change-Id: Ia79353e686240c5915e40b8202d3fdc289df2158 Signed-off-by: Yujun Zhang --- tests/integration/ansible.cfg | 23 +------ tests/integration/fixtures/case.json | 14 ---- tests/integration/fixtures/pod.json | 6 -- tests/integration/fixtures/project.json | 4 -- tests/integration/group_vars/all | 5 -- tests/integration/host_vars/localhost | 7 -- tests/integration/hosts | 1 + tests/integration/hosts.default | 4 -- tests/integration/run.yaml | 109 -------------------------------- tests/integration/setup.yaml | 64 ------------------- tests/integration/workspace-create.yml | 13 ++++ 11 files changed, 16 insertions(+), 234 deletions(-) delete mode 100644 tests/integration/fixtures/case.json delete mode 100644 tests/integration/fixtures/pod.json delete mode 100644 tests/integration/fixtures/project.json delete mode 100644 tests/integration/group_vars/all delete mode 100644 tests/integration/host_vars/localhost create mode 100644 tests/integration/hosts delete mode 100644 tests/integration/hosts.default delete mode 100644 tests/integration/run.yaml delete mode 100644 tests/integration/setup.yaml create mode 100644 tests/integration/workspace-create.yml (limited to 'tests') diff --git a/tests/integration/ansible.cfg b/tests/integration/ansible.cfg index a94cad0d..a11bd1af 100644 --- a/tests/integration/ansible.cfg +++ b/tests/integration/ansible.cfg @@ -11,24 +11,5 @@ # some basic default values... -inventory = ./hosts -library = ../../qtip/ansible_library/ - -# set plugin path directories here, separate with colons -action_plugins = ../../qtip/ansible_library/plugins/action -#cache_plugins = /usr/share/ansible/plugins/cache -#callback_plugins = /usr/share/ansible/plugins/callback -#connection_plugins = /usr/share/ansible/plugins/connection -#lookup_plugins = /usr/share/ansible/plugins/lookup -#inventory_plugins = /usr/share/ansible/plugins/inventory -#vars_plugins = /usr/share/ansible/plugins/vars -filter_plugins = ../../qtip/ansible_library/plugins/filter -#test_plugins = /usr/share/ansible/plugins/test -#terminal_plugins = /usr/share/ansible/plugins/terminal -#strategy_plugins = /usr/share/ansible/plugins/strategy - -callback_whitelist = profile_tasks - -[ssh_connection] - -ssh_args = -F ./ssh.cfg \ No newline at end of file +inventory = hosts +roles_path = ../../resources/roles diff --git a/tests/integration/fixtures/case.json b/tests/integration/fixtures/case.json deleted file mode 100644 index 22abc40f..00000000 --- a/tests/integration/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/tests/integration/fixtures/pod.json b/tests/integration/fixtures/pod.json deleted file mode 100644 index 654b5828..00000000 --- a/tests/integration/fixtures/pod.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "details": "", - "role": "", - "name": "qtip-pod", - "mode": "" -} \ No newline at end of file diff --git a/tests/integration/fixtures/project.json b/tests/integration/fixtures/project.json deleted file mode 100644 index ecd03e83..00000000 --- a/tests/integration/fixtures/project.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "qtip", - "description": "Platform Performance Benchmarking" -} \ No newline at end of file diff --git a/tests/integration/group_vars/all b/tests/integration/group_vars/all deleted file mode 100644 index 251b1420..00000000 --- a/tests/integration/group_vars/all +++ /dev/null @@ -1,5 +0,0 @@ -qtip_resources: ../../resources -qtip_reports: ./reports -qtip_fixtures: ./fixtures -qtip_dump: ./dump -qtip_cache: ./.cache diff --git a/tests/integration/host_vars/localhost b/tests/integration/host_vars/localhost deleted file mode 100644 index 76b53b79..00000000 --- a/tests/integration/host_vars/localhost +++ /dev/null @@ -1,7 +0,0 @@ -testapi_url: http://10.62.105.17:8711/api/v1 -project_name: qtip -case_name: compute -pod_name: qtip-pod -installer: fuel -version: master -scenario: demo diff --git a/tests/integration/hosts b/tests/integration/hosts new file mode 100644 index 00000000..2302edae --- /dev/null +++ b/tests/integration/hosts @@ -0,0 +1 @@ +localhost ansible_connection=local diff --git a/tests/integration/hosts.default b/tests/integration/hosts.default deleted file mode 100644 index 65739726..00000000 --- a/tests/integration/hosts.default +++ /dev/null @@ -1,4 +0,0 @@ -fuel-master - -[local] -localhost ansible_connection=local diff --git a/tests/integration/run.yaml b/tests/integration/run.yaml deleted file mode 100644 index 696235c2..00000000 --- a/tests/integration/run.yaml +++ /dev/null @@ -1,109 +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 -############################################################################## - ---- -# Execute compute benchmark plan and collect data -# - system information -# - test condition -# - performance metrics -- hosts: compute - tasks: - - name: check ssh connection - ping: - tags: [setup] - -- hosts: compute - roles: - - development-tools - tags: [setup] - -- hosts: compute - roles: - - unixbench - tags: [unixbench] - -- hosts: compute - tasks: - - name: collect system information - include: "{{ qtip_resources }}/metric/inxi.yaml" - - name: ssl metrics - include: "{{ qtip_resources }}/metric/openssl.yaml" - tags: [ssl] - - name: DPI metrics - include: "{{ qtip_resources }}/metric/nDPI.yaml" - vars: - nDPI_cwd: "{{ ansible_env.HOME }}/qtip/nDPI" - nDPI_file: "dpi.pcap" - tags: [dpi] - - name: memory metrics - include: "{{ qtip_resources }}/metric/ramspeed.yaml" - vars: - cwd: "{{ ansible_env.HOME }}/qtip/ramspeed" - tags: [mem] -- hosts: compute - tasks: - - name: calculate QPI of compute - calculate: - metrics: - ssl_rsa: "{{ openssl_rsa_metrics }}" - spec: "{{ qtip_resources }}/QPI/compute.yaml" - register: qpi_result - delegate_to: localhost - tags: [calculate] - -- hosts: localhost - tasks: - - name: aggregate QPI results from all tested nodes - aggregate: - group: compute - register: pod_result - -# Generate and publish report - -- hosts: localhost - tasks: - - name: create report folder - file: - path: "{{ qtip_reports }}" - state: directory - - name: create system information report - template: - src: "{{ qtip_resources }}/template/system-info.j2" - dest: "{{ qtip_reports }}/system-info" - - name: create qpi report - template: - src: "{{ qtip_resources }}/template/qpi-report.j2" - dest: "{{ qtip_reports }}/qpi-report" - tags: [report] - - name: create dpi metrics report - template: - src: "{{ qtip_resources }}/template/dpi-metrics.j2" - dest: "{{ qtip_reports }}/dpi-metrics" - tags: [report, dpi] - - name: push result to testapi - uri: - url: "{{ testapi_url }}/results" - body: "{{ item|to_json }}" - method: POST - body_format: json - status_code: 200 - with_items: - - - project_name: "{{ project_name }}" - case_name: "{{ case_name }}" - pod_name: "{{ pod_name }}" - installer: "{{ installer }}" - version: "{{ version }}" - scenario: "{{ scenario }}" - start_date: "{{ ansible_date_time.date }}" - stop_date: "{{ ansible_date_time.date }}" - criteria: "" - details: "{{ pod_result }}" - - tags: [testapi] diff --git a/tests/integration/setup.yaml b/tests/integration/setup.yaml deleted file mode 100644 index fed5e9d9..00000000 --- a/tests/integration/setup.yaml +++ /dev/null @@ -1,64 +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-master - gather_facts: no - tasks: - - name: collect facts of fuel hosts - fuel: - - name: update inventory file - template: src={{ qtip_resources }}/template/hosts.j2 dest=./hosts - delegate_to: localhost - - name: update ssh.cfg file - template: src={{ qtip_resources }}/template/ssh.cfg.j2 dest=./ssh.cfg - delegate_to: localhost - -- hosts: apex-undercloud - gather_facts: no - - tasks: - - name: collect overcloud baremetal info - shell: . /root/stackrc && openstack baremetal list --fields instance_uuid properties provision_state --format json - register: baremetal_info - - name: collect overcloud server info - shell: . /root/stackrc && openstack server list --format json - register: server_info - - name: generate inventory - apex_generate_inventory: - baremetal_info: "{{ baremetal_info.stdout | from_json }}" - server_info: "{{ server_info.stdout | from_json }}" - - name: update inventory file - template: src={{ qtip_resources }}/template/hosts.j2 dest=./hosts - delegate_to: localhost - - name: update ssh.cfg file - template: src={{ qtip_resources }}/template/ssh.cfg.j2 dest=./ssh.cfg - delegate_to: localhost - -# Initialize testapi database -- hosts: localhost - tasks: - - name: create project and pod - uri: - url: "{{ testapi_url }}/{{item}}s" - method: POST - body: "{{ lookup('file', '{}/{}.json'.format(qtip_fixtures, item)) }}" - status_code: [200, 403] - body_format: json - with_items: - - project - - pod - - name: create cases - uri: - url: "{{ testapi_url }}/projects/qtip/cases" - method: POST - body: "{{ lookup('file', '{}/case.json'.format(qtip_fixtures)) }}" - status_code: [200, 403] - body_format: json - tags: [testapi] diff --git a/tests/integration/workspace-create.yml b/tests/integration/workspace-create.yml new file mode 100644 index 00000000..83e0fadd --- /dev/null +++ b/tests/integration/workspace-create.yml @@ -0,0 +1,13 @@ +############################################################################## +# 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: + - { role: qtip-bootstrap, installer: fuel } -- cgit 1.2.3-korg