CI: Install python deps, mark oraclelinux rsyslog as skipped
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/ Disables rsyslog build on oraclelinux (both source and binary) and tripleoclient (binary). Depends-On: https://review.opendev.org/737829 Change-Id: I6068abcbc0e73eeab77b0aa99983a95adc6defd3
This commit is contained in:
parent
8cce9293a4
commit
d12137ce64
|
@ -198,14 +198,17 @@ SKIPPED_IMAGES = {
|
||||||
"monasca-thresh",
|
"monasca-thresh",
|
||||||
"nova-mksproxy",
|
"nova-mksproxy",
|
||||||
"ovsdpdk",
|
"ovsdpdk",
|
||||||
|
"rsyslog",
|
||||||
"searchlight-base",
|
"searchlight-base",
|
||||||
"solum-base",
|
"solum-base",
|
||||||
|
"tripleoclient",
|
||||||
"vmtp",
|
"vmtp",
|
||||||
"zun-base"
|
"zun-base"
|
||||||
],
|
],
|
||||||
'oraclelinux+source': [
|
'oraclelinux+source': [
|
||||||
"bifrost-base",
|
"bifrost-base",
|
||||||
"ovsdpdk",
|
"ovsdpdk",
|
||||||
|
"rsyslog",
|
||||||
"tripleoclient",
|
"tripleoclient",
|
||||||
# TODO(jeffrey4l): remove tripleo-ui when following bug is fixed
|
# TODO(jeffrey4l): remove tripleo-ui when following bug is fixed
|
||||||
# https://bugs.launchpad.net/tripleo/+bug/1744215
|
# https://bugs.launchpad.net/tripleo/+bug/1744215
|
||||||
|
|
|
@ -16,7 +16,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
|
||||||
|
|
|
@ -37,6 +37,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 }}-{{ install_type }}
|
command: "{{ ansible_user_dir }}/tox-venv/bin/tox -e {{ action }}-{{ base_distro }}-{{ install_type }}"
|
||||||
args:
|
args:
|
||||||
chdir: "{{ zuul.project.src_dir }}"
|
chdir: "{{ zuul.project.src_dir }}"
|
||||||
|
|
Loading…
Reference in New Issue