From cb2c5fc1a56247f0c837534156ada758f67a8d7f Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Wed, 2 Jan 2019 18:46:57 +0100 Subject: [PATCH] Fix grenade job to clone Octavia from base branch The job was cloning Octavia always from stable/queens while all other enabled services were being cloned from $BASE_DEVSTACK_BRANCH. http://logs.openstack.org/64/602564/15/check/octavia-grenade/39f9e96/ \ logs/grenade_localrc.txt.gz http://logs.openstack.org/64/602564/15/check/octavia-grenade/39f9e96/ \ logs/grenade.sh.txt.gz#_2019-01-02_13_27_29_587 Change-Id: I3bc85588c4cac6bba24648f2793940fddc17f4a2 --- devstack/upgrade/settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index d69e530bac..c6b1b9f935 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -1,7 +1,7 @@ register_project_for_upgrade octavia register_db_to_save octavia -devstack_localrc base enable_plugin octavia https://git.openstack.org/openstack/octavia stable/queens +devstack_localrc base enable_plugin octavia https://git.openstack.org/openstack/octavia devstack_localrc target enable_plugin octavia https://git.openstack.org/openstack/octavia devstack_localrc base enable_service o-api o-cw o-hm o-hk octavia