CI: Install python deps, fix mod_wsgi in cyborg-api, disable masakari-monitors

setuptools is missing from infra image - so it needs to be installed.

Copy cat of a kolla-ansible change: https://review.opendev.org/#/c/735808/

Fixes also cyborg-api to use py3 mod_wsgi in centos8

Temporarily disables masakari-monitors build, because it fails on centos8
due to problems with libvirt-python===5.7.0 (upper-constraints):

Missing type converters:
virTypedParameterPtr:1
ERROR: failed virConnectSetIdentity

Depends-On: https://review.opendev.org/#/c/736744/
Change-Id: I6068abcbc0e73eeab77b0aa99983a95adc6defd3
This commit is contained in:
Michal Nasiadka 2020-06-17 13:13:09 +02:00
parent 47df050742
commit 729bd45077
4 changed files with 49 additions and 2 deletions

View File

@ -13,8 +13,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set cyborg_api_packages = [ {% set cyborg_api_packages = [
'mod_ssl', 'mod_ssl',
'mod_wsgi'
] %} ] %}
{% if distro_python_version.startswith('3') %}
{% set cyborg_api_packages = cyborg_api_packages + ['python3-mod_wsgi'] %}
{% else %}
{% set cyborg_api_packages = cyborg_api_packages + ['mod_wsgi'] %}
{% endif %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set cyborg_api_packages = [ {% set cyborg_api_packages = [
'apache2', 'apache2',

View File

@ -167,6 +167,7 @@ UNBUILDABLE_IMAGES = {
'centos8+source': { 'centos8+source': {
"cyborg-agent", # opae-sdk does not support CentOS 8 "cyborg-agent", # opae-sdk does not support CentOS 8
"masakari-monitors", # python-libvirt===5.7.0 fails
}, },
'debian': { 'debian': {

View File

@ -18,7 +18,49 @@
path: "{{ kolla_build_logs_dir }}" path: "{{ kolla_build_logs_dir }}"
state: directory state: directory
- block:
- name: Ensure yum-utils is installed
# NOTE(mgoddard): The CentOS image used in CI has epel-release installed,
# but the configure-mirrors role used by Zuul disables epel. Since we
# install epel-release and expect epel to be enabled, enable it here.
package:
name: yum-utils
state: present
- name: Enable the EPEL repository
command: yum-config-manager --enable epel
become: true
when:
- ansible_os_family == "RedHat"
- name: Install Python2 modules
become: true
package:
name:
- python-pip
- python-setuptools
- python-wheel
- python-virtualenv
- name: Install virtualenv on Debian systems
# NOTE(hrw): On RedHat systems it is part of python3-virtualenv
package:
name:
- virtualenv
become: true
when:
ansible_os_family == "Debian"
- name: Upgrade pip to latest version
# NOTE(mnasiadka): pip 8.x delivered with EPEL has problems installing
# zipp and configparser
become: true
command: "pip install --upgrade pip"
- name: Ensure tox is installed - name: Ensure tox is installed
pip: pip:
name: tox name: tox
virtualenv: "{{ ansible_user_dir }}/tox-venv"
become: true become: true

View File

@ -33,6 +33,6 @@
dest: /etc/kolla/template_overrides.j2 dest: /etc/kolla/template_overrides.j2
- name: Run tox - name: Run tox
command: tox -e {{ action }}-{{ base_distro }}{{ base_tag | default('') }}-{{ install_type }} command: "{{ ansible_user_dir }}/tox-venv/bin/tox -e {{ action }}-{{ base_distro }}{{ base_tag | default('') }}-{{ install_type }}"
args: args:
chdir: "{{ zuul.project.src_dir }}" chdir: "{{ zuul.project.src_dir }}"