From 4a3d09d3fc27757d9fdfe4d87ff3dead8d6cbb7e Mon Sep 17 00:00:00 2001
From: Rui Chen <chenrui.momo@gmail.com>
Date: Wed, 20 Feb 2019 15:06:03 +0800
Subject: [PATCH] Fix devstack trove deploying failed

- OpenStack upstream have used tox to deploy trove in python3,
  OpenLab keep to use same way to do it.
- OpenStack CI use 4 vCPUs and 8G RAM instances to run trove integration
  tests, OpenLab should be able to use same falvor, so remove nodepool
  label `ubuntu-xenial-otc`.

Closes: theopenlab/openlab#183
---
 .../run.yaml                                           | 10 +++++++---
 zuul.d/jobs.yaml                                       |  1 -
 zuul.d/nodesets.yaml                                   |  6 ------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/playbooks/terraform-provider-openstack-acceptance-test-trove/run.yaml b/playbooks/terraform-provider-openstack-acceptance-test-trove/run.yaml
index 3db849d8e..2b5836f0f 100644
--- a/playbooks/terraform-provider-openstack-acceptance-test-trove/run.yaml
+++ b/playbooks/terraform-provider-openstack-acceptance-test-trove/run.yaml
@@ -26,9 +26,13 @@
         cmd: |
           set -e
           set -x
-          cd /opt/stack/trove/integration/scripts/
-          ./trovestack install
-          ./trovestack kick-start mysql
+          export BRIDGE_IP=10.1.0.1
+          export DEST='/opt/stack'
+          export PATH_DEVSTACK_SRC=$DEST/devstack
+          export TROVE_RESIZE_TIME_OUT=''
+          cd $DEST/trove
+          tox -etrovestack -vv -- install
+          tox -etrovestack -vv -- kick-start mysql
           source /home/zuul/devstack/openrc admin admin
 
           # Following commands show some info for debugging
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 98f837833..25c530511 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -128,7 +128,6 @@
     description: |
       Run terraform-provider-openstack trove acceptance test on master branch
     run: playbooks/terraform-provider-openstack-acceptance-test-trove/run.yaml
-    nodeset: ubuntu-xenial-otc
 
 - job:
     name: terraform-provider-openstack-acceptance-test-lbaas
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index dfd2ffda4..255624fc4 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -30,12 +30,6 @@
       - name: ubuntu-bionic-vxh-arm64
         label: ubuntu-bionic-vxh-arm64
 
-- nodeset:
-    name: ubuntu-xenial-otc
-    nodes:
-      - name: ubuntu-xenial-otc
-        label: ubuntu-xenial-otc
-
 - nodeset:
     name: ubuntu-xenial-huaweicloud
     nodes: