From: Cedric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 1 May 2019 07:35:23 +0000 (+0000)
Subject: Merge "Manage block_migration_for_live_migration"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=16ffbff2c72591d16e2baac12eadc3f66969d54d;hp=af641dcc16b6d7970831658aecfa4d6cce7ee136;p=releng.git

Merge "Manage block_migration_for_live_migration"
---

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 2162bf828..4f3c9ef98 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -157,6 +157,7 @@ apex)
 compute-feature-enabled:
     shelve: false
     vnc_console: true
+    block_migration_for_live_migration: false
 identity-feature-enabled:
     api_v2: false
     api_v2_admin: false
@@ -177,6 +178,7 @@ compass)
 compute-feature-enabled:
     shelve: false
     vnc_console: false
+    block_migration_for_live_migration: false
     spice_console: true
 identity-feature-enabled:
     api_v2: false