diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-06 11:01:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-06 11:01:19 +0000 |
| commit | ee7d2979eb204474488042126923fdbced7d0155 (patch) | |
| tree | 3aeb24d6dafc2569f7ba62f4f49ec9f6506e8701 /tests | |
| parent | d749b341602497b12d7bd56a28d99297840e0805 (diff) | |
| parent | 29f223c02a27d3f65b0355d6b9098afd0373f12e (diff) | |
| download | kolla-ansible-ee7d2979eb204474488042126923fdbced7d0155.tar.gz kolla-ansible-ee7d2979eb204474488042126923fdbced7d0155.zip | |
Merge "CentOS 8: CI: Add upgrade job"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/run.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/run.yml b/tests/run.yml index 8004ba00c..dafc9cdce 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -11,6 +11,8 @@ vars: # NOTE(yoctozepto): needed here to use in other facts too openstack_core_enabled: "{{ scenario not in ['bifrost', 'mariadb'] }}" + # TODO(mgoddard): Remove when previous_release is ussuri. + is_centos8: "{{ ansible_os_family == 'RedHat' and ansible_distribution_major_version | int == 8 }}" set_fact: kolla_inventory_path: "/etc/kolla/inventory" logs_dir: "/tmp/logs" @@ -24,7 +26,7 @@ openstack_core_tested: "{{ scenario in ['core', 'ceph-ansible', 'zun', 'cells', 'swift', 'linuxbridge'] }}" dashboard_enabled: "{{ openstack_core_enabled }}" # TODO(mgoddard): Remove when previous_release is ussuri. - playbook_python_version: "{{ '2' if is_upgrade and previous_release == 'train' else '3' }}" + playbook_python_version: "{{ '2' if is_upgrade and previous_release == 'train' and not is_centos8 else '3' }}" - name: Install xfsprogs package for Swift filesystems become: true @@ -498,6 +500,7 @@ executable: pip2 state: absent become: true + when: playbook_python_version == '2' - name: install ansible and ARA for python 3 vars: |