Update requirements
* fix discovering os distro Change-Id: I96666afc1ad9a5c64ca5b98647cb0ba185389524
This commit is contained in:
parent
eb96a5d15c
commit
8481235950
|
@ -14,13 +14,14 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import jinja2
|
import jinja2
|
||||||
|
import markupsafe
|
||||||
|
|
||||||
|
|
||||||
def get_template(template):
|
def get_template(template):
|
||||||
|
|
||||||
def include_raw_file(file_name):
|
def include_raw_file(file_name):
|
||||||
try:
|
try:
|
||||||
return jinja2.Markup(loader.get_source(env, file_name)[0])
|
return markupsafe.Markup(loader.get_source(env, file_name)[0])
|
||||||
except jinja2.TemplateNotFound:
|
except jinja2.TemplateNotFound:
|
||||||
# NOTE(amaretskiy): re-raise error to make its message clear
|
# NOTE(amaretskiy): re-raise error to make its message clear
|
||||||
raise IOError("File not found: %s" % file_name)
|
raise IOError("File not found: %s" % file_name)
|
||||||
|
|
|
@ -3,9 +3,10 @@
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
# Rally core dependencies
|
# Rally core dependencies
|
||||||
alembic!=1.2.0 # MIT
|
alembic!=1.2.0,!=1.6.3 # MIT
|
||||||
Jinja2 # BSD-3-Clause
|
Jinja2 # BSD-3-Clause
|
||||||
jsonschema # MIT
|
jsonschema # MIT
|
||||||
|
markupsafe # BSD-3-Clause
|
||||||
oslo.config!=4.3.0,!=4.4.0 # Apache Software License
|
oslo.config!=4.3.0,!=4.4.0 # Apache Software License
|
||||||
# do not forget to remove `testresources` from test-requirements. it is a
|
# do not forget to remove `testresources` from test-requirements. it is a
|
||||||
# dependency of oslo.db for tests
|
# dependency of oslo.db for tests
|
||||||
|
@ -13,7 +14,7 @@ oslo.db # Apache Software License
|
||||||
oslo.log!=3.44.2,!=4.1.2,!=4.2.0 # Apache Software License
|
oslo.log!=3.44.2,!=4.1.2,!=4.2.0 # Apache Software License
|
||||||
paramiko # LGPL
|
paramiko # LGPL
|
||||||
pbr!=2.1.0 # Apache Software License
|
pbr!=2.1.0 # Apache Software License
|
||||||
PrettyTable<0.8 # BSD (3 clause)
|
PrettyTable # BSD (3 clause)
|
||||||
pyOpenSSL # Apache License, Version 2.0
|
pyOpenSSL # Apache License, Version 2.0
|
||||||
PyYAML # MIT
|
PyYAML # MIT
|
||||||
python-subunit # Apache-2.0 or BSD
|
python-subunit # Apache-2.0 or BSD
|
||||||
|
|
|
@ -5,7 +5,7 @@ description_file =
|
||||||
README.rst
|
README.rst
|
||||||
author = OpenStack
|
author = OpenStack
|
||||||
author_email = openstack-discuss@lists.openstack.org
|
author_email = openstack-discuss@lists.openstack.org
|
||||||
home_page = https://docs.openstack.org/rally/latest/
|
home_page = https://rally.readthedocs.io/
|
||||||
license = Apache License, Version 2.0
|
license = Apache License, Version 2.0
|
||||||
requires_python = >=3.6
|
requires_python = >=3.6
|
||||||
classifier =
|
classifier =
|
||||||
|
|
|
@ -1,7 +1,14 @@
|
||||||
- hosts: all
|
- hosts: all
|
||||||
name: Prepare host to install Rally
|
name: Prepare host to install Rally
|
||||||
tasks:
|
tasks:
|
||||||
- name: Set Apache URL
|
- name: Check OS distro (CentOS)
|
||||||
|
when: ansible_distribution == "CentOS"
|
||||||
|
set_fact:
|
||||||
|
# in case of centos we do not care about minor versions
|
||||||
|
os_distro: '{{ ansible_distribution }} {{ ansible_distribution_major_version }}'
|
||||||
|
|
||||||
|
- name: Check OS distro (Ubuntu)
|
||||||
|
when: ansible_distribution == "Ubuntu"
|
||||||
set_fact:
|
set_fact:
|
||||||
os_distro: '{{ ansible_distribution }} {{ ansible_distribution_version }}'
|
os_distro: '{{ ansible_distribution }} {{ ansible_distribution_version }}'
|
||||||
|
|
||||||
|
@ -10,14 +17,20 @@
|
||||||
shell:
|
shell:
|
||||||
cmd: |
|
cmd: |
|
||||||
sudo yum remove -y python-crypto || true
|
sudo yum remove -y python-crypto || true
|
||||||
|
sudo yum remove -y python36-PyYAML || true
|
||||||
|
|
||||||
sudo yum update
|
sudo yum update
|
||||||
sudo yum install -y yum-utils
|
sudo yum install -y yum-utils
|
||||||
sudo yum groupinstall -y development
|
sudo yum groupinstall -y development
|
||||||
|
|
||||||
sudo yum install -y https://centos7.iuscommunity.org/ius-release.rpm
|
sudo yum install -y https://repo.ius.io/ius-release-el7.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
|
||||||
sudo yum install -y python36u python36u-devel
|
sudo yum install -y python36u python36u-devel
|
||||||
|
|
||||||
|
- name: Uninstall required packages (Centos-8)
|
||||||
|
when: os_distro == "CentOS 8"
|
||||||
|
become: true
|
||||||
|
shell: dnf remove -y python3-pyyaml
|
||||||
|
|
||||||
- name: Install required packages (Ubuntu-Bionic)
|
- name: Install required packages (Ubuntu-Bionic)
|
||||||
when: os_distro == "Ubuntu 18.04"
|
when: os_distro == "Ubuntu 18.04"
|
||||||
shell:
|
shell:
|
||||||
|
@ -46,10 +59,14 @@
|
||||||
curl https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
|
curl https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
|
||||||
sudo python3 /tmp/get-pip.py
|
sudo python3 /tmp/get-pip.py
|
||||||
|
|
||||||
|
- name: Update pip3 if needed
|
||||||
|
when: os_distro == "CentOS 8"
|
||||||
|
become: true
|
||||||
|
shell: pip3 install --upgrade pip
|
||||||
|
|
||||||
- name: Install bindep
|
- name: Install bindep
|
||||||
shell:
|
become: true
|
||||||
cmd: |
|
shell: pip3 install --upgrade bindep PyYAML
|
||||||
sudo pip3 install bindep
|
|
||||||
|
|
||||||
- name: Prepare rally plugins stored at home dir
|
- name: Prepare rally plugins stored at home dir
|
||||||
shell:
|
shell:
|
||||||
|
|
|
@ -1,71 +1,71 @@
|
||||||
alembic===1.4.3
|
alembic===1.6.5
|
||||||
appdirs===1.4.4
|
appdirs===1.4.4
|
||||||
argparse===1.4.0
|
argparse===1.4.0
|
||||||
attrs===20.2.0
|
attrs===21.2.0
|
||||||
bcrypt===3.2.0
|
bcrypt===3.2.0
|
||||||
certifi===2020.6.20
|
certifi===2021.5.30
|
||||||
cffi===1.14.3
|
cffi===1.14.5
|
||||||
chardet===3.0.4
|
chardet===4.0.0
|
||||||
cryptography===3.2
|
cryptography===3.4.7
|
||||||
debtcollector===2.2.0
|
debtcollector===2.2.0
|
||||||
decorator===4.4.2
|
decorator===4.4.2
|
||||||
distlib===0.3.1
|
distlib===0.3.2
|
||||||
extras===1.0.0
|
extras===1.0.0
|
||||||
filelock===3.0.12
|
filelock===3.0.12
|
||||||
fixtures===3.0.0
|
fixtures===3.0.0
|
||||||
|
greenlet===1.1.0
|
||||||
idna===2.10
|
idna===2.10
|
||||||
importlib-metadata===2.0.0
|
importlib-metadata===4.5.0
|
||||||
importlib-resources===3.2.0
|
importlib-resources===5.1.4
|
||||||
iso8601===0.1.13
|
iso8601===0.1.14
|
||||||
Jinja2===2.11.2
|
Jinja2===3.0.1
|
||||||
jsonschema===3.2.0
|
jsonschema===3.2.0
|
||||||
linecache2===1.0.0
|
linecache2===1.0.0
|
||||||
Mako===1.1.3
|
Mako===1.1.4
|
||||||
MarkupSafe===1.1.1
|
MarkupSafe===2.0.1
|
||||||
msgpack===1.0.0
|
msgpack===1.0.2
|
||||||
netaddr===0.8.0
|
netaddr===0.8.0
|
||||||
netifaces===0.10.9
|
netifaces===0.11.0
|
||||||
oslo.config===8.3.2
|
oslo.config===8.7.0
|
||||||
oslo.context===3.1.1
|
oslo.context===3.3.0
|
||||||
oslo.db===8.4.0
|
oslo.db===9.0.0
|
||||||
oslo.i18n===5.0.1
|
oslo.i18n===5.0.1
|
||||||
oslo.log===4.4.0
|
oslo.log===4.5.0
|
||||||
oslo.serialization===4.0.1
|
oslo.serialization===4.1.0
|
||||||
oslo.utils===4.6.0
|
oslo.utils===4.9.0
|
||||||
packaging===20.4
|
packaging===20.9
|
||||||
paramiko===2.7.2
|
paramiko===2.7.2
|
||||||
pbr===5.5.1
|
pbr===5.6.0
|
||||||
pip===20.1.1
|
pip===21.0.1
|
||||||
prettytable===0.7.2
|
prettytable===0.7.2
|
||||||
pycparser===2.20
|
pycparser===2.20
|
||||||
pyinotify===0.9.6
|
pyinotify===0.9.6
|
||||||
PyNaCl===1.4.0
|
PyNaCl===1.4.0
|
||||||
pyOpenSSL===19.1.0
|
pyOpenSSL===20.0.1
|
||||||
pyparsing===2.4.7
|
pyparsing===2.4.7
|
||||||
pyrsistent===0.17.3
|
pyrsistent===0.17.3
|
||||||
python-dateutil===2.8.1
|
python-dateutil===2.8.1
|
||||||
python-editor===1.0.4
|
python-editor===1.0.4
|
||||||
python-mimeparse===1.6.0
|
python-mimeparse===1.6.0
|
||||||
python-subunit===1.4.0
|
python-subunit===1.4.0
|
||||||
pytz===2020.1
|
pytz===2021.1
|
||||||
PyYAML===5.3.1
|
PyYAML===5.4.1
|
||||||
requests===2.23.0
|
requests===2.25.1
|
||||||
rfc3986===1.4.0
|
rfc3986===1.5.0
|
||||||
setuptools===50.3.0
|
setuptools===57.0.0
|
||||||
six===1.15.0
|
six===1.16.0
|
||||||
SQLAlchemy===1.3.20
|
SQLAlchemy===1.3.23
|
||||||
sqlalchemy-migrate===0.13.0
|
|
||||||
sqlparse===0.4.1
|
sqlparse===0.4.1
|
||||||
stevedore===3.2.2
|
stevedore===3.3.0
|
||||||
Tempita===0.5.2
|
Tempita===0.5.2
|
||||||
testresources===2.0.1
|
testresources===2.0.1
|
||||||
testscenarios===0.5.0
|
testscenarios===0.5.0
|
||||||
testtools===2.4.0
|
testtools===2.4.0
|
||||||
traceback2===1.4.0
|
traceback2===1.4.0
|
||||||
|
typing-extensions===3.10.0.0
|
||||||
unittest2===1.1.0
|
unittest2===1.1.0
|
||||||
urllib3===1.25.11
|
urllib3===1.26.5
|
||||||
virtualenv===20.1.0
|
virtualenv===20.4.7
|
||||||
wcwidth===0.2.5
|
wheel===0.36.2
|
||||||
wheel===0.35.1
|
|
||||||
wrapt===1.12.1
|
wrapt===1.12.1
|
||||||
zipp===3.4.0
|
zipp===3.4.1
|
||||||
|
|
Loading…
Reference in New Issue