Add python-troveclient in requirements.txt

Change-Id: I2bd0d81171df85c05423e19ab2e4afa82fcf880e

2 files changed, 12 insertions, 24 deletions

diff --git a/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep b/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep
index bf71faa7..5a0c1ecd 100755
--- a/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep
+++ b/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep
@@ -17,27 +17,12 @@ REQUIREMENTS_FILE=${TROVESTACK_SCRIPTS}/../../requirements.txt
 
 sudo -Hiu ${HOST_USERNAME} dd if=${REQUIREMENTS_FILE} of=${TMP_HOOKS_PATH}/requirements.txt
 
-# Grab the upper constraints file, but don't fail if we can't find it.
-# If we are running in the CI environment, $DEST will be set and stackrc
-# will use $DEST/requirements as the location for the requirements repo.
-# Use that as it will help us chain a job with something that is changing UC.
-
 UC_FILE=upper-constraints.txt
+UC_DIR=$(pwd)
+UC_BRANCH=${TROVE_BRANCH##stable/}
 
-if [ -f "${DEST}/requirements/${UC_FILE}" ]; then
-    echo "Found ${DEST}/requirements/${UC_FILE}, using that"
-    sudo -Hiu ${HOST_USERNAME} dd if="${DEST}/requirements/${UC_FILE}" \
-        of="${TMP_HOOKS_PATH}/${UC_FILE}"
-else
-    UC_DIR=$(pwd)
-    UC_BRANCH=${TROVE_BRANCH##stable/}
-
-    set +e
-    curl -L -o "${UC_DIR}/${UC_FILE}" "https://releases.openstack.org/constraints/upper/${UC_BRANCH}"
-    set -e
-
-    if [ -f "${UC_DIR}/${UC_FILE}" ]; then
-        sudo -Hiu ${HOST_USERNAME} dd if="${UC_DIR}/${UC_FILE}" of=${TMP_HOOKS_PATH}/${UC_FILE}
-        rm -f "${UC_DIR}/${UC_FILE}"
-    fi
+curl -L -o "${UC_DIR}/${UC_FILE}" "https://releases.openstack.org/constraints/upper/${UC_BRANCH}"
+if [ -f "${UC_DIR}/${UC_FILE}" ]; then
+    sudo -Hiu ${HOST_USERNAME} dd if="${UC_DIR}/${UC_FILE}" of=${TMP_HOOKS_PATH}/${UC_FILE}
+    rm -f "${UC_DIR}/${UC_FILE}"
 fi
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack
index 24ab6c70..4f6273e6 100755
--- a/integration/scripts/trovestack
+++ b/integration/scripts/trovestack
@@ -188,8 +188,6 @@ function dump_env() {
         done
         exclaim "Dumping pip modules:"
         pip freeze | sort
-        exclaim "Dumping domain list:"
-        openstack --os-cloud=devstack-admin domain list
         exclaim "Dumping configuration completed"
         set -e
     fi
@@ -764,6 +762,10 @@ function cmd_test_init() {
 
     exclaim "Creating Test Flavors."
     add_test_flavors
+
+    exclaim "Re-installing python-troveclient from git"
+    pip3 uninstall -y python-troveclient
+    pip3 install -U git+https://opendev.org/openstack/python-troveclient@master#egg=python-troveclient
 }
 
 function cmd_build_image() {
@@ -1207,8 +1209,9 @@ function cmd_kick_start() {
     fi
 
     exclaim "Running kick-start for $DATASTORE_TYPE"
-    dump_env
     cmd_test_init "${DATASTORE_TYPE}" "${DATASTORE_VERSION}"
+
+    dump_env
 }
 
 # Start functional test. The guest image should be created and registered in