diff options
| author | Lingxian Kong <anlin.kong@gmail.com> | 2019-03-27 21:57:27 +1300 |
|---|---|---|
| committer | Lingxian Kong <anlin.kong@gmail.com> | 2019-03-28 10:32:26 +0000 |
| commit | 6ea816312e48b9ea05e497147e488bc6ec7ac24d (patch) | |
| tree | 91727167efbe71a279c6c9b80a0c34c3c5d5be1f /integration | |
| parent | c590106f79e2644283526a8739042206e0fa4301 (diff) | |
| download | trove-6ea816312e48b9ea05e497147e488bc6ec7ac24d.tar.gz | |
Fix tests for Ubuntu Bionic migration of CI jobs
Change-Id: I2fee668c3774f7e87ce3478ca998f8b366c6cd41
Diffstat (limited to 'integration')
| -rw-r--r-- | integration/scripts/conf/test_begin.conf | 1 | ||||
| -rwxr-xr-x | integration/scripts/trovestack | 5 | ||||
| -rw-r--r-- | integration/scripts/trovestack.rc | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/integration/scripts/conf/test_begin.conf b/integration/scripts/conf/test_begin.conf index 534341c6..18ffc2fc 100644 --- a/integration/scripts/conf/test_begin.conf +++ b/integration/scripts/conf/test_begin.conf @@ -97,6 +97,7 @@ "dbaas_datastore": "%datastore_type%", "dbaas_datastore_version": "%datastore_version%", "neutron_enabled": %neutron_enabled%, + "swift_enabled": %swift_enabled%, "shared_network": "%shared_network%", "shared_network_subnet": "%shared_network_subnet%", "instance_fault_1_flavor_name": "test.fault_1-1", diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack index a1ceafc7..9caff297 100755 --- a/integration/scripts/trovestack +++ b/integration/scripts/trovestack @@ -537,7 +537,7 @@ function set_mysql_pkg() { MYSQL_PKG="mysql-community-server" MYSQL_VER="5.6" else - if [ "$RELEASE" == "xenial" ]; then + if [[ "$RELEASE" == "xenial" || "$RELEASE" == "bionic" ]]; then MYSQL_PKG="mysql-server-5.7" MYSQL_VER="5.7" else @@ -734,6 +734,9 @@ function mod_confs() { # Enable neutron tests if needed sed -i "s/%neutron_enabled%/$ENABLE_NEUTRON/g" $TEST_CONF + # Enable backup related tests if Swift is enabled + sed -i "s/%swift_enabled%/$ENABLE_SWIFT/g" $TEST_CONF + # If neutron is enabled, the devstack plugin will have created an alt_demo # network - write this info to the confs so that the integration tests can # use it. diff --git a/integration/scripts/trovestack.rc b/integration/scripts/trovestack.rc index 921e6b26..928f08b2 100644 --- a/integration/scripts/trovestack.rc +++ b/integration/scripts/trovestack.rc @@ -13,6 +13,9 @@ REGION_NAME=${REGION_NAME:-${OS_REGION_NAME:-RegionOne}} # Enable Neutron ENABLE_NEUTRON=$(get_bool ENABLE_NEUTRON true) +# Enable Swift +ENABLE_SWIFT=$(get_bool ENABLE_SWIFT true) + # Enable osprofiler - note: Enables Ceilometer as well ENABLE_PROFILER=$(get_bool ENABLE_PROFILER false) PROFILER_TRACE_SQL=$(get_bool PROFILER_TRACE_SQL false) |