Use os_tempest for running tempest on standalone

It depends on ansible-config_template and python_venv_build role.[1.] Make tempest_cidr cacheable so that it will be consumed in os_tempest role as it does not depends on extra-commons so added an extra tasks to mkake the variable useable. [1.] https://tree.taiga.io/project/tripleo-ci-board/us/234 https://tree.taiga.io/project/tripleo-ci-board/us/554 Change-Id: I5eb7fb64411220bc198ebae15f866693eadc3a4d
openstack-archive · Jan 23, 2019 · df2401d · df2401d
1 parent 2bc4f29
commit df2401d
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 0 deletions.
diff --git a/playbooks/multinode-standalone.yml b/playbooks/multinode-standalone.yml
@@ -44,3 +44,37 @@
     - {role: validate-tempest, when: run_tempest|bool}
   tags:
     - standalone
+
+- name: Validate the deployment
+  hosts: undercloud
+  tasks:
+    - include_role:
+        name: os_tempest
+      vars:
+        ansible_become: true
+        tempest_run: 'yes'
+        debug: true
+        tempest_install_method: distro
+        tempest_use_tempestconf: true
+        tempest_service_setup_host: '{{ inventory_hostname }}'
+        tempest_image_dir: '/home/zuul/images'
+        tempest_cloud_name: 'standalone'
+        tempest_service_available_cinder: true
+        tempest_service_available_neutron: true
+        tempest_service_available_swift: true
+        tempest_service_available_glance: true
+        tempest_service_available_horizon: true
+        tempest_service_available_nova: true
+        keystone_service_internaluri_insecure: false
+        tempest_public_net_physical_type: 'datacentre'
+        tempest_public_subnet_cidr: '{{ tempest_cidr }}'
+        tempest_public_subnet_gateway_ip: '{{ tempest_cidr|nthhost(1) }}'
+        tempest_public_subnet_allocation_pools: '{{ tempest_cidr|nthhost(100) ~ "-" ~ tempest_cidr|nthhost(120) }}'
+        tempest_workspace: '/home/zuul/tempest'
+        stackviz_venv_bin: "/home/zuul/stackviz_venv/bin"
+      when:
+        - not run_tempest|bool
+        - use_os_tempest is defined
+        - use_os_tempest|bool
+  tags:
+    - standalone
diff --git a/roles/build-test-packages/defaults/main.yml b/roles/build-test-packages/defaults/main.yml
@@ -25,3 +25,6 @@ artg_skipped_projects:
   - openstack-infra/tripleo-ci
   - openstack-infra/zuul-jobs
   - openstack/openstack-virtual-baremetal
+  - openstack/openstack-ansible-os_tempest
+  - openstack/ansible-role-python_venv_build
+  - openstack/ansible-config_template
diff --git a/roles/collect-logs/tasks/publish.yml b/roles/collect-logs/tasks/publish.yml
@@ -58,11 +58,25 @@
         gunzip -fr {{ artcl_collect_dir }}/stackviz;
     fi;
 
+- name: fetch stackviz results to the root of the collect_dir for os_tempest
+  shell: >
+    if [ -d {{ artcl_collect_dir }}/undercloud/var/log/tempest/stackviz/data ]; then
+        cp -r {{ artcl_collect_dir }}/undercloud/var/log/tempest/stackviz {{ artcl_collect_dir }};
+        gunzip -fr {{ artcl_collect_dir }}/stackviz;
+    fi;
+  when: use_os_tempest is defined
+
 - name: fetch tempest results to the root of the collect_dir
   shell: >
     cp {{ artcl_collect_dir }}/undercloud/home/stack/tempest/tempest.{xml,html}{,.gz} {{ artcl_collect_dir }} || true;
     gunzip {{ artcl_collect_dir }}/tempest.{xml,html}.gz || true;
 
+- name: fetch tempest results to the root of the collect_dir for os_tempest
+  shell: >
+    cp {{ artcl_collect_dir }}/undercloud/var/log/tempest/stestr_results.html.gz {{ artcl_collect_dir }} || true;
+    gunzip {{ artcl_collect_dir }}/stestr_results.html.gz || true;
+  when: use_os_tempest is defined
+
 - name: Fetch .sh and .log files from local working directory on localhost
   shell: >
     cp {{ item }} {{ artcl_collect_dir }}/

diff --git a/roles/nodepool-setup/defaults/main.yml b/roles/nodepool-setup/defaults/main.yml
@@ -11,6 +11,9 @@ repos:
   - https://git.openstack.org/openstack-infra/tripleo-ci
   - https://git.openstack.org/openstack-dev/devstack
   - https://git.openstack.org/openstack-infra/devstack-gate
+  - https://git.openstack.org/openstack/openstack-ansible-os_tempest
+  - https://git.openstack.org/openstack/ansible-config_template
+  - https://git.openstack.org/openstack/ansible-role-python_venv_build
 zuul_changes: "{{ lookup('env', 'ZUUL_CHANGES') }}"
 subnode_swap_size: 8388608  # 8GB
 update_subnodes: true

diff --git a/roles/standalone/tasks/main.yml b/roles/standalone/tasks/main.yml
@@ -4,6 +4,11 @@
     gather_subset: "!min,distribution"
   when: ansible_distribution is not defined
 
+- name: Cache tempest network cidr
+  set_fact:
+    tempest_cidr: "{{ undercloud_network_cidr }}"
+  when: use_os_tempest is defined
+
 # tasks file for all_in_one
 
 # standalone params