diff options
| author | Tim Burke <tim.burke@gmail.com> | 2022-04-03 23:11:59 -0700 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2022-04-04 17:17:06 -0700 |
| commit | d29cbc399693616cd9ef42100110c3c3e039e883 (patch) | |
| tree | 399e237c196f3202794c3c6a5e19a9cedd24034f /tools | |
| parent | ec964b23bb0025737c12ba2addafc94b69d671eb (diff) | |
| download | swift-d29cbc399693616cd9ef42100110c3c3e039e883.tar.gz | |
CI: Run ceph and rolling upgrade tests under py3
As part of that, the ceph test runner needed up-rev'ing to run under
py3. As a result, the known-failures shifted.
Trim the on-demand rolling upgrade jobs list -- now that it's running
py3, we only expect it to pass for train and beyond.
Also, pin smmap version on py2 -- otherwise, the remaining experimental
jobs running on centos-7 fail.
Change-Id: Ibe46aecf0f4461be59eb206bfe9063cc1bfff706
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/playbooks/ceph-s3tests/run.yaml | 7 | ||||
| -rw-r--r-- | tools/playbooks/multinode_setup/make_rings.yaml | 2 | ||||
| -rw-r--r-- | tools/playbooks/multinode_setup/pre.yaml | 1 | ||||
| -rw-r--r-- | tools/playbooks/multinode_setup/run.yaml | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/tools/playbooks/ceph-s3tests/run.yaml b/tools/playbooks/ceph-s3tests/run.yaml index ae5bd85ba..618c6821a 100644 --- a/tools/playbooks/ceph-s3tests/run.yaml +++ b/tools/playbooks/ceph-s3tests/run.yaml @@ -28,11 +28,16 @@ repo: "https://github.com/tipabu/s3compat.git" dest: "{{ ansible_env.HOME }}/s3compat" + - name: Install virtualenv + pip: + name: virtualenv + become: true + - name: Install s3compat requirements pip: requirements: "{{ ansible_env.HOME }}/s3compat/requirements.txt" virtualenv: "{{ ansible_env.HOME }}/venv" - virtualenv_python: python2 + virtualenv_python: python3 become: true - name: Run s3compat tests diff --git a/tools/playbooks/multinode_setup/make_rings.yaml b/tools/playbooks/multinode_setup/make_rings.yaml index 0fef9d626..6eda38dc5 100644 --- a/tools/playbooks/multinode_setup/make_rings.yaml +++ b/tools/playbooks/multinode_setup/make_rings.yaml @@ -33,7 +33,7 @@ - name: build swift shell: - cmd: python setup.py sdist + cmd: python3 setup.py sdist executable: /bin/bash chdir: '{{ zuul.project.src_dir }}' diff --git a/tools/playbooks/multinode_setup/pre.yaml b/tools/playbooks/multinode_setup/pre.yaml index d7e4670a8..55eb8d199 100644 --- a/tools/playbooks/multinode_setup/pre.yaml +++ b/tools/playbooks/multinode_setup/pre.yaml @@ -2,7 +2,6 @@ roles: # Run bindep and test-setup after devstack so that they won't interfere - role: bindep - bindep_profile: test bindep_dir: "{{ zuul_work_dir }}" - test-setup - ensure-tox diff --git a/tools/playbooks/multinode_setup/run.yaml b/tools/playbooks/multinode_setup/run.yaml index a2eca8eb7..a186124c2 100644 --- a/tools/playbooks/multinode_setup/run.yaml +++ b/tools/playbooks/multinode_setup/run.yaml @@ -22,7 +22,7 @@ - name: install swift become: true shell: - cmd: python setup.py develop + cmd: python3 setup.py develop executable: /bin/bash chdir: '{{ zuul.project.src_dir }}' @@ -37,6 +37,6 @@ include_role: name: tox vars: - tox_envlist: func + tox_envlist: func-py3 tox_environment: SWIFT_TEST_CONFIG_FILE: /home/{{ ansible_ssh_user }}/test.conf |