x/tobiko
Code Issues Proposed changes

Enforce using compiled python release on RHEL-7 by pinning 3.7 release

Browse Source 
Use the same configuration for CentOS-7 and RHEL-7

Change-Id: Ie18bcfcab53e4d5c82d19a002ae4dded15a5e6cd
This commit is contained in:
Federico Ressi 2020-06-04 10:58:54 +02:00
parent eb2ddc0cfe
commit 38b58a6d0e
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/tests/test_infrared_plugin.yaml
View File

@ -16,7 +16,6 @@
- name: "show ansible distro variables" - name: "show ansible distro variables"
debug: debug:
msg: msg:
ansible_architecture: '{{ ansible_architecture }}'
ansible_distribution: '{{ ansible_distribution }}' ansible_distribution: '{{ ansible_distribution }}'
ansible_distribution_major_version: '{{ ansible_distribution_major_version }}' ansible_distribution_major_version: '{{ ansible_distribution_major_version }}'
ansible_distribution_version: '{{ ansible_distribution_version }}' ansible_distribution_version: '{{ ansible_distribution_version }}'
@ -28,7 +27,7 @@
with_first_found: with_first_found:
- "test-{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml" - "test-{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
- "test-{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml" - "test-{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
- "test-{{ ansible_distribution }}.{{ ansible_architecture }}.yaml" - "test-{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yaml"
- "test-{{ ansible_distribution }}.yaml" - "test-{{ ansible_distribution }}.yaml"
- "test-{{ ansible_os_family }}.yaml" - "test-{{ ansible_os_family }}.yaml"
register: include_platform_vars register: include_platform_vars

1
roles/tobiko-ensure-python3/tasks/platform.yaml
View File

@ -14,6 +14,7 @@
ignore_errors: yes ignore_errors: yes
with_first_found: with_first_found:
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml" - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
- "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yaml"
- "{{ ansible_distribution }}.{{ ansible_architecture }}.yaml" - "{{ ansible_distribution }}.{{ ansible_architecture }}.yaml"
- "{{ ansible_distribution }}.yaml" - "{{ ansible_distribution }}.yaml"
- "{{ ansible_os_family }}.yaml" - "{{ ansible_os_family }}.yaml"

7
roles/tobiko-ensure-python3/vars/CentOS-7.yaml
View File

@ -1,7 +0,0 @@
---
python_packages:
python3:
- python3
python3.6:
- python36

3
roles/tobiko-ensure-python3/vars/RedHat-7.yaml
View File

@ -1,3 +1,6 @@
--- ---
compile_python3: yes compile_python3: yes
python_release: "3.7.7"
python_command: "python3.7"

5
zuul.d/infrared.yaml
View File

@ -13,6 +13,7 @@
- name: openstack/requirements - name: openstack/requirements
- name: x/tobiko - name: x/tobiko
vars: vars:
ensure_pip_from_packages_with_python2: no
test_collect_dir: '{{ zuul_output_dir }}/logs' test_collect_dir: '{{ zuul_output_dir }}/logs'
test_inventory_file: '{{ zuul_work_dir }}/ansible_hosts' test_inventory_file: '{{ zuul_work_dir }}/ansible_hosts'
tox_envlist: infrared tox_envlist: infrared
@ -32,6 +33,10 @@
voting: false voting: false
description: | description: |
Run test cases using tobiko infrared plugin on CentOS 7 Run test cases using tobiko infrared plugin on CentOS 7
vars:
tox_environment:
# This patchset is required to workaround missing SE Linux Python 3 bindings
IR_DEPS: "git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/15/493715/5"
- job: - job: