Skip to content

Commit d12137c

Browse files
committed
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
1 parent 8cce929 commit d12137c

File tree

3 files changed

+46
-1
lines changed

3 files changed

+46
-1
lines changed

kolla/image/build.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,17 @@
198198
"monasca-thresh",
199199
"nova-mksproxy",
200200
"ovsdpdk",
201+
"rsyslog",
201202
"searchlight-base",
202203
"solum-base",
204+
"tripleoclient",
203205
"vmtp",
204206
"zun-base"
205207
],
206208
'oraclelinux+source': [
207209
"bifrost-base",
208210
"ovsdpdk",
211+
"rsyslog",
209212
"tripleoclient",
210213
# TODO(jeffrey4l): remove tripleo-ui when following bug is fixed
211214
# https://bugs.launchpad.net/tripleo/+bug/1744215

tests/playbooks/pre.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,49 @@
1616
path: "{{ kolla_build_logs_dir }}"
1717
state: directory
1818

19+
- block:
20+
21+
- name: Ensure yum-utils is installed
22+
# NOTE(mgoddard): The CentOS image used in CI has epel-release installed,
23+
# but the configure-mirrors role used by Zuul disables epel. Since we
24+
# install epel-release and expect epel to be enabled, enable it here.
25+
package:
26+
name: yum-utils
27+
state: present
28+
29+
- name: Enable the EPEL repository
30+
command: yum-config-manager --enable epel
31+
32+
become: true
33+
when:
34+
- ansible_os_family == "RedHat"
35+
36+
- name: Install Python2 modules
37+
become: true
38+
package:
39+
name:
40+
- python-pip
41+
- python-setuptools
42+
- python-wheel
43+
- python-virtualenv
44+
45+
- name: Install virtualenv on Debian systems
46+
# NOTE(hrw): On RedHat systems it is part of python3-virtualenv
47+
package:
48+
name:
49+
- virtualenv
50+
become: true
51+
when:
52+
ansible_os_family == "Debian"
53+
54+
- name: Upgrade pip to latest version
55+
# NOTE(mnasiadka): pip 8.x delivered with EPEL has problems installing
56+
# zipp and configparser
57+
become: true
58+
command: "pip install --upgrade pip"
59+
1960
- name: Ensure tox is installed
2061
pip:
2162
name: tox
63+
virtualenv: "{{ ansible_user_dir }}/tox-venv"
2264
become: true

tests/playbooks/run.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@
3737
dest: /etc/kolla/template_overrides.j2
3838

3939
- name: Run tox
40-
command: tox -e {{ action }}-{{ base_distro }}-{{ install_type }}
40+
command: "{{ ansible_user_dir }}/tox-venv/bin/tox -e {{ action }}-{{ base_distro }}-{{ install_type }}"
4141
args:
4242
chdir: "{{ zuul.project.src_dir }}"

0 commit comments

Comments
 (0)