From 3b3d711157da9f5293de3f0bdda30d4c4a51fca2 Mon Sep 17 00:00:00 2001 From: "John L. Villalovos" Date: Tue, 29 Mar 2016 13:27:48 -0700 Subject: [PATCH] Enable Grenade usage as a plugin Enable Grenade to run tests for Ironic using the plugin method. Also provide some documentation on the fact that openstack-infra/project-config will need to be updated for these changes to take effect. Change-Id: I49cf37333c55dbbdbb75737f1c7fd2ecaf983f21 --- devstack/upgrade/settings | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index 3c46356481..b9cefa4d62 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -1,5 +1,17 @@ -# eventually this will be handled by this being in the ironic tree -if is_service_enabled ir-api; then - register_project_for_upgrade ironic - register_db_to_save ironic -fi \ No newline at end of file +# Grenade needs to know that Ironic has a Grenade plugin. This is done in the +# gate by setting GRENADE_PLUGINRC when using openstack-infra/devstack-gate. +# That means that in the project openstack-infra/project-config we will need to +# update the Ironic grenade job(s) in jenkins/jobs/devstack-gate.yaml with +# this: +# export GRENADE_PLUGINRC="enable_grenade_plugin ironic https://git.openstack.org/openstack/ironic" +# If openstack-infra/project-config is not updated then the Grenade tests will +# never get run for Ironic + +register_project_for_upgrade ironic +register_db_to_save ironic + +devstack_localrc base enable_plugin ironic https://git.openstack.org/openstack/ironic +devstack_localrc base enable_service ir-api ir-cond + +devstack_localrc target enable_plugin ironic https://git.openstack.org/openstack/ironic +devstack_localrc target enable_service ir-api ir-cond