diff options
| author | Tim Burke <tim.burke@gmail.com> | 2019-10-23 12:24:17 -0700 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2020-12-17 11:25:42 -0800 |
| commit | d186af14faf15e8f1e6a0c1f3a5d916f9a791749 (patch) | |
| tree | 7c86fc54378b7d7aeb3fe64df4daed1d615086b3 /tools | |
| parent | 6e9e84a5c2be7a5e0a8b5ef123ac3cbb272c3ebc (diff) | |
| download | swift-d186af14faf15e8f1e6a0c1f3a5d916f9a791749.tar.gz | |
Add py3 probe tests on CentOS 8
Change-Id: Iae86d8838854023010686d3d4bed3befe6160ca5
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/playbooks/common/install_dependencies.yaml | 16 | ||||
| -rw-r--r-- | tools/playbooks/saio_single_node_setup/make_rings.yaml | 7 | ||||
| -rwxr-xr-x | tools/test-setup.sh | 12 |
3 files changed, 26 insertions, 9 deletions
diff --git a/tools/playbooks/common/install_dependencies.yaml b/tools/playbooks/common/install_dependencies.yaml index 18fd52065..41826606f 100644 --- a/tools/playbooks/common/install_dependencies.yaml +++ b/tools/playbooks/common/install_dependencies.yaml @@ -22,15 +22,19 @@ name: pip extra_args: --upgrade - - name: installing dependencies - yum: name={{ item }} state=present - with_items: - - python-pyeclib - - python-nose - - python-swiftclient + - name: install rsync-daemon - CentOS 8 + package: + name: rsync-daemon + state: present + when: + - ansible_facts['distribution'] == "CentOS" + - ansible_facts['distribution_major_version'] == "8" - name: install python modules with pip pip: name={{ item }} state=present extra_args='--upgrade' with_items: - crudini - eventlet + - nose + - pyeclib + - python-swiftclient diff --git a/tools/playbooks/saio_single_node_setup/make_rings.yaml b/tools/playbooks/saio_single_node_setup/make_rings.yaml index 65c469a23..f68a7a47c 100644 --- a/tools/playbooks/saio_single_node_setup/make_rings.yaml +++ b/tools/playbooks/saio_single_node_setup/make_rings.yaml @@ -17,10 +17,11 @@ tasks: - name: install swift become: true - shell: - cmd: python setup.py develop - executable: /bin/bash + pip: + state: present + name: . chdir: '{{ zuul.project.src_dir }}' + editable: true - name: make rings shell: diff --git a/tools/test-setup.sh b/tools/test-setup.sh index de65749e9..f69142d77 100755 --- a/tools/test-setup.sh +++ b/tools/test-setup.sh @@ -20,6 +20,11 @@ function is_rhel7 { cat /etc/*release | grep -q -e "Red Hat" -e "CentOS" -e "CloudLinux" && \ cat /etc/*release | grep -q 'release 7' } +function is_rhel8 { + [ -f /usr/bin/dnf ] && \ + cat /etc/*release | grep -q -e "Red Hat" -e "CentOS" -e "CloudLinux" && \ + cat /etc/*release | grep -q 'release 8' +} if is_rhel7; then @@ -28,3 +33,10 @@ if is_rhel7; then sudo yum install -y centos-release-openstack-rocky sudo yum install -y liberasurecode-devel fi + +if is_rhel8; then + # Install CentOS OpenStack repos so that we have access to some extra + # packages. + sudo dnf install -y centos-release-openstack-ussuri + sudo dnf install -y liberasurecode-devel +fi |