diff --git a/.zuul.yaml b/.zuul.yaml index bca360e2..ee7e974f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -9,7 +9,9 @@ check: jobs: - python-tempestconf-tempest-devstack-admin + - python-tempestconf-tempest-devstack-admin-py3 - python-tempestconf-tempest-devstack-demo + - python-tempestconf-tempest-devstack-demo-py3 - python-tempestconf-tempest-packstack-admin - python-tempestconf-tempest-packstack-demo - tripleo-ci-centos-7-scenario002-standalone @@ -18,7 +20,9 @@ gate: jobs: - python-tempestconf-tempest-devstack-admin + - python-tempestconf-tempest-devstack-admin-py3 - python-tempestconf-tempest-devstack-demo + - python-tempestconf-tempest-devstack-demo-py3 - python-tempestconf-tempest-packstack-admin - python-tempestconf-tempest-packstack-demo - tripleo-ci-centos-7-scenario002-standalone @@ -125,3 +129,37 @@ test_demo: true cloud_admin: packstack-admin +- job: + name: python-tempestconf-tempest-devstack-admin-py3 + parent: python-tempestconf-tempest-devstack-admin + description: | + Tempest job for python-tempestconf on a devstack environment with python3 enabled. + vars: + tempestconf_pip_virtualenv_python: "python3" + devstack_localrc: + USE_PYTHON3: true + devstack_services: + s-account: false + s-container: false + s-object: false + s-proxy: false + # without Swift, c-bak cannot run (in the Gate at least) + c-bak: false + +- job: + name: python-tempestconf-tempest-devstack-demo-py3 + parent: python-tempestconf-tempest-devstack-demo + description: | + Tempest job for python-tempestconf on a devstack environment with python3 enabled + for demo users. + vars: + tempestconf_pip_virtualenv_python: "python3" + devstack_localrc: + USE_PYTHON3: true + devstack_services: + s-account: false + s-container: false + s-object: false + s-proxy: false + # without Swift, c-bak cannot run (in the Gate at least) + c-bak: false diff --git a/roles/generate-tempestconf-file-cloud/tasks/main.yaml b/roles/generate-tempestconf-file-cloud/tasks/main.yaml index 8f9f0f48..6c0738ef 100644 --- a/roles/generate-tempestconf-file-cloud/tasks/main.yaml +++ b/roles/generate-tempestconf-file-cloud/tasks/main.yaml @@ -2,6 +2,7 @@ - name: Create python-tempestconf venv with latest pip, setuptools and pbr pip: virtualenv: "{{ virtualenvs.tempestconf }}" + virtualenv_python: "{{ tempestconf_pip_virtualenv_python|default(omit) }}" name: "{{ item }}" state: latest with_items: @@ -22,6 +23,7 @@ name: "." virtualenv: "{{ virtualenvs.tempestconf }}" chdir: "{{ tempestconf_src_relative_path }}" + virtualenv_python: "{{ tempestconf_pip_virtualenv_python|default(omit) }}" - name: Generate tempest configuration file shell: | diff --git a/roles/generate-tempestconf-file/tasks/main.yaml b/roles/generate-tempestconf-file/tasks/main.yaml index a21ce532..c566c42a 100644 --- a/roles/generate-tempestconf-file/tasks/main.yaml +++ b/roles/generate-tempestconf-file/tasks/main.yaml @@ -7,6 +7,7 @@ virtualenv: "{{ virtualenvs.tempestconf }}" name: "{{ item }}" state: latest + virtualenv_python: "{{ tempestconf_pip_virtualenv_python|default(omit) }}" with_items: - pip - setuptools @@ -25,6 +26,7 @@ name: "." virtualenv: "{{ virtualenvs.tempestconf }}" chdir: "{{ tempestconf_src_relative_path }}" + virtualenv_python: "{{ tempestconf_pip_virtualenv_python|default(omit) }}" - name: "Cat keystonerc_ file (only in packstack case)" shell: |