openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Rewrite install of fuel-plugin-builder framework" into stable/7.0

This commit is contained in:
Jenkins 2017-04-18 10:05:34 +00:00 committed by Gerrit Code Review
parent 7116dac3d6 5f9b14b54b
commit 92e905d098
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fuelweb_test/helpers/fuel_actions.py
View File

@ -29,6 +29,7 @@ from fuelweb_test.helpers.regenerate_repo import regenerate_centos_repo
from fuelweb_test.helpers.regenerate_repo import regenerate_ubuntu_repo
from fuelweb_test.helpers.utils import cond_upload
from fuelweb_test.helpers.utils import run_on_remote_get_results
from fuelweb_test.settings import FUEL_PLUGIN_BUILDER_FROM_GIT
from fuelweb_test.settings import FUEL_PLUGIN_BUILDER_REPO
from fuelweb_test.settings import FUEL_USE_LOCAL_NTPD
from fuelweb_test.settings import KEYSTONE_CREDS
@ -400,20 +401,20 @@ class FuelPluginBuilder(BaseActions):
def fpb_install(self):
"""
Installs fuel plugin builder from sources
in nailgun container on master node
Installs fuel plugin builder on master node
:return: nothing
"""
fpb_cmd = """bash -c 'yum -y install git tar createrepo \
rpm dpkg-devel rpm-build;
git clone {0};
cd fuel-plugins/fuel_plugin_builder;
python setup.py sdist;
cd dist;
pip install *.tar.gz'""".format(FUEL_PLUGIN_BUILDER_REPO)
rpms = "createrepo dpkg-devel dpkg-dev rpm-build python-pip"
fpb_package = "fuel-plugin-builder"
if FUEL_PLUGIN_BUILDER_FROM_GIT:
rpms += " tar git"
fpb_package = "git+{}".format(FUEL_PLUGIN_BUILDER_REPO)
self.execute_in_container(fpb_cmd, self.container, 0)
self.execute_in_container("yum -y install {}".format(rpms),
self.container, 0)
self.execute_in_container("pip install {}".format(fpb_package),
self.container, 0)
def fpb_create_plugin(self, name):
"""

2
fuelweb_test/settings.py
View File

@ -428,6 +428,8 @@ TIMESTAT_PATH_YAML = os.environ.get(
'TIMESTAT_PATH_YAML', os.path.join(
LOGS_DIR, 'timestat_{}.yaml'.format(time.strftime("%Y%m%d"))))
FUEL_PLUGIN_BUILDER_FROM_GIT = get_var_as_bool('FUEL_PLUGIN_BUILDER_FROM_GIT',
False)
FUEL_PLUGIN_BUILDER_REPO = ('https://github.com/stackforge/fuel-plugins.git '
'--branch stable/7.0')