summaryrefslogtreecommitdiff
path: root/gate
diff options
context:
space:
mode:
authorMatt Riedemann <mriedem.os@gmail.com>2019-10-31 09:53:17 -0400
committerStephen Finucane <sfinucan@redhat.com>2019-11-14 16:06:02 +0000
commit85a1dd338bf5c0317b1e969927471118f040abe0 (patch)
tree030632f22b4f000f8d4afb0e6eb888908d8c0b86 /gate
parent8f341eb4a49be1d01a953387b00eed1c6de5713a (diff)
downloadnova-85a1dd338bf5c0317b1e969927471118f040abe0.tar.gz
Convert legacy nova-live-migration and nova-multinode-grenade to py3
This makes these legacy devstack-gate-based jobs run with python3. Change-Id: Id565a20ba3ebe2ea1a72b879bd2762ba3e655658
Diffstat (limited to 'gate')
-rwxr-xr-xgate/live_migration/hooks/ceph.sh3
-rwxr-xr-xgate/live_migration/hooks/run_tests.sh1
2 files changed, 3 insertions, 1 deletions
diff --git a/gate/live_migration/hooks/ceph.sh b/gate/live_migration/hooks/ceph.sh
index 3713dc88a4..5c1d7e2e6c 100755
--- a/gate/live_migration/hooks/ceph.sh
+++ b/gate/live_migration/hooks/ceph.sh
@@ -6,8 +6,9 @@ function prepare_ceph {
source /tmp/devstack-plugin-ceph/devstack/lib/ceph
install_ceph
configure_ceph
- #install ceph-common package on compute nodes
+ #install ceph-common package and additional python3 ceph libraries on compute nodes
$ANSIBLE subnodes --become -f 5 -i "$WORKSPACE/inventory" -m raw -a "executable=/bin/bash
+ USE_PYTHON3=${USE_PYTHON3:-True}
source $BASE/new/devstack/functions
source $BASE/new/devstack/functions-common
git clone https://opendev.org/openstack/devstack-plugin-ceph /tmp/devstack-plugin-ceph
diff --git a/gate/live_migration/hooks/run_tests.sh b/gate/live_migration/hooks/run_tests.sh
index 00ad341634..331f2fa204 100755
--- a/gate/live_migration/hooks/run_tests.sh
+++ b/gate/live_migration/hooks/run_tests.sh
@@ -56,6 +56,7 @@ echo '4. test with Ceph for root + ephemeral disks'
# Discover and set variables for the OS version so the devstack-plugin-ceph
# scripts can find the correct repository to install the ceph packages.
GetOSVersion
+USE_PYTHON3=${USE_PYTHON3:-True}
prepare_ceph
GLANCE_API_CONF=${GLANCE_API_CONF:-/etc/glance/glance-api.conf}
configure_and_start_glance