diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2020-06-17 13:13:09 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2020-06-25 13:19:19 +0200 |
| commit | d12137ce64fab7e8436aa1c2e32e3bc6ed47c1a1 (patch) | |
| tree | 2b4702fa1eb02611bc1fa1853093ce30ed9be955 | |
| parent | 8cce9293a42afca7a99f32090d4f55b1cf7310a7 (diff) | |
| download | kolla-d12137ce64fab7e8436aa1c2e32e3bc6ed47c1a1.tar.gz kolla-d12137ce64fab7e8436aa1c2e32e3bc6ed47c1a1.zip | |
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
| -rwxr-xr-x | kolla/image/build.py | 3 | ||||
| -rw-r--r-- | tests/playbooks/pre.yml | 42 | ||||
| -rw-r--r-- | tests/playbooks/run.yml | 2 |
3 files changed, 46 insertions, 1 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 5fd2cde0c..7496573ea 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -198,14 +198,17 @@ SKIPPED_IMAGES = { "monasca-thresh", "nova-mksproxy", "ovsdpdk", + "rsyslog", "searchlight-base", "solum-base", + "tripleoclient", "vmtp", "zun-base" ], 'oraclelinux+source': [ "bifrost-base", "ovsdpdk", + "rsyslog", "tripleoclient", # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed # https://bugs.launchpad.net/tripleo/+bug/1744215 diff --git a/tests/playbooks/pre.yml b/tests/playbooks/pre.yml index b7f5a6491..ba546bfaf 100644 --- a/tests/playbooks/pre.yml +++ b/tests/playbooks/pre.yml @@ -16,7 +16,49 @@ path: "{{ kolla_build_logs_dir }}" 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 pip: name: tox + virtualenv: "{{ ansible_user_dir }}/tox-venv" become: true diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml index d22a38870..a26baa72e 100644 --- a/tests/playbooks/run.yml +++ b/tests/playbooks/run.yml @@ -37,6 +37,6 @@ dest: /etc/kolla/template_overrides.j2 - 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: chdir: "{{ zuul.project.src_dir }}" |
