From 85a1dd338bf5c0317b1e969927471118f040abe0 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Thu, 31 Oct 2019 09:53:17 -0400 Subject: [PATCH] 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 --- gate/live_migration/hooks/ceph.sh | 3 ++- gate/live_migration/hooks/run_tests.sh | 1 + playbooks/legacy/nova-grenade-multinode/run.yaml | 1 + playbooks/legacy/nova-live-migration/run.yaml | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gate/live_migration/hooks/ceph.sh b/gate/live_migration/hooks/ceph.sh index 3713dc88a4d2..5c1d7e2e6c5b 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 00ad34163498..331f2fa20445 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 diff --git a/playbooks/legacy/nova-grenade-multinode/run.yaml b/playbooks/legacy/nova-grenade-multinode/run.yaml index ffdced6cc833..d77fc0b9f953 100644 --- a/playbooks/legacy/nova-grenade-multinode/run.yaml +++ b/playbooks/legacy/nova-grenade-multinode/run.yaml @@ -33,6 +33,7 @@ export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_TEMPEST_NOTESTS=1 export DEVSTACK_GATE_GRENADE=pullup + export DEVSTACK_GATE_USE_PYTHON3=True # By default grenade runs only smoke tests so we need to set # RUN_SMOKE to False in order to run live migration tests using # grenade diff --git a/playbooks/legacy/nova-live-migration/run.yaml b/playbooks/legacy/nova-live-migration/run.yaml index dd60e38a645f..ef8853135bbf 100644 --- a/playbooks/legacy/nova-live-migration/run.yaml +++ b/playbooks/legacy/nova-live-migration/run.yaml @@ -47,6 +47,7 @@ export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_NOTESTS=1 export DEVSTACK_GATE_TOPOLOGY="multinode" + export DEVSTACK_GATE_USE_PYTHON3=True function post_test_hook { /opt/stack/new/nova/gate/live_migration/hooks/run_tests.sh $BASE/new/nova/gate/test_evacuate.sh