From cc57e32c48f4a2acc3b0c57e50573cda3ce5ac98 Mon Sep 17 00:00:00 2001
From: Lingxian Kong <anlin.kong@gmail.com>
Date: Sun, 22 Nov 2020 23:04:57 +1300
Subject: [PATCH] Use nested virt node for trove functional test

Enable the jobs trove-functional-mysql and trove-tempest.

Change-Id: I930a1468fec5922916af0819698fceb94bddb2f3
---
 .zuul.yaml         | 21 +++++++++++++++++++--
 devstack/plugin.sh |  1 +
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 49a96f4330..9121d1c85e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,3 +1,13 @@
+- nodeset:
+    name: trove-ubuntu-bionic
+    nodes:
+      - name: controller
+        label: nested-virt-ubuntu-bionic
+    groups:
+      - name: controller
+        nodes:
+          - controller
+
 - project:
     templates:
       - check-requirements
@@ -17,6 +27,10 @@
             voting: false
         - trove-tempest-ipv6-only:
             voting: false
+        - trove-tempest
+        - trove-functional-mysql:
+            voting: false
+
     gate:
       queue: trove
       jobs:
@@ -98,6 +112,8 @@
 - job:
     name: trove-functional-mysql
     parent: trove-devstack-base
+    nodeset: trove-ubuntu-bionic
+    timeout: 10800
     vars:
       devstack_localrc:
         TROVE_RESIZE_TIME_OUT: 1800
@@ -287,7 +303,8 @@
 - job:
     name: trove-tempest
     parent: devstack-tempest
-    timeout: 7800
+    nodeset: trove-ubuntu-bionic
+    timeout: 10800
     required-projects: &base_required_projects
       - openstack/trove
       - openstack/trove-tempest-plugin
@@ -300,7 +317,7 @@
       - ^releasenotes/.*$
     vars: &base_vars
       tox_envlist: all
-      tempest_concurrency: 2
+      tempest_concurrency: 1
       devstack_localrc:
         TEMPEST_PLUGINS: /opt/stack/trove-tempest-plugin
         USE_PYTHON3: true
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 2b83fa43d0..dffe0298a5 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -478,6 +478,7 @@ function create_guest_image {
       --tag trove \
       --property hw_rng_model='virtio' \
       --file ${image_file} \
+      --debug \
       -c id -f value)
      echo "Glance image ${glance_image_id} uploaded"